tor-commits September 2015

tor-commits@lists.torproject.org

15 participants
1411 discussions

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

22 Sep '15

commit 8278571ffb337c36b725c4dbea77994d933322c8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 29 14:39:57 2015 -0700 Simplify get_type() Mostly tweaking its hidden service handling (no need to frontload its query). --- nyx/connections/entries.py | 56 ++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/nyx/connections/entries.py b/nyx/connections/entries.py index 8d1a0d4..9c8d83e 100644 --- a/nyx/connections/entries.py +++ b/nyx/connections/entries.py @@ -102,13 +102,11 @@ class ConnectionPanelEntry(object): return len(nyx.util.tracker.get_consensus_tracker().get_all_relay_fingerprints(self.connection.remote_address)) == 0 elif self.get_type() == nyx.connections.conn_entry.Category.EXIT: # DNS connections exiting us aren't private (since they're hitting our - # resolvers). Everything else, however, is. + # resolvers). Everything else is. return self.connection.remote_port != 53 or self.connection.protocol != 'udp' - # for everything else this isn't a concern - - return False + return False # for everything else this isn't a concern def get_lines(self): """ @@ -223,42 +221,38 @@ class ConnectionPanelLine: def get_type(connection): - import nyx.connections.conn_entry import nyx.util.tracker - + from nyx.connections.conn_entry import Category controller = tor_controller() - my_hidden_service_ports = [] # ports belonging to our hidden service configuation - - for hs_config in controller.get_hidden_service_conf({}).values(): - my_hidden_service_ports += [entry[2] for entry in hs_config['HiddenServicePort']] - if connection.local_port in controller.get_ports(Listener.OR, []): - return nyx.connections.conn_entry.Category.INBOUND + return Category.INBOUND elif connection.local_port in controller.get_ports(Listener.DIR, []): - return nyx.connections.conn_entry.Category.INBOUND + return Category.INBOUND elif connection.local_port in controller.get_ports(Listener.SOCKS, []): - return nyx.connections.conn_entry.Category.SOCKS - elif connection.remote_port in my_hidden_service_ports: - return nyx.connections.conn_entry.Category.HIDDEN + return Category.SOCKS elif connection.local_port in controller.get_ports(Listener.CONTROL, []): - return nyx.connections.conn_entry.Category.CONTROL - else: - destination_fingerprint = nyx.util.tracker.get_consensus_tracker().get_relay_fingerprint(connection.remote_address, connection.remote_port) + return Category.CONTROL - if not destination_fingerprint: - # Not a known relay. This might be an exit connection. + for hs_config in controller.get_hidden_service_conf({}).values(): + if connection.remote_port == hs_config['HiddenServicePort']: + return Category.HIDDEN - exit_policy = controller.get_exit_policy(None) + fingerprint = nyx.util.tracker.get_consensus_tracker().get_relay_fingerprint(connection.remote_address, connection.remote_port) - if exit_policy and exit_policy.can_exit_to(connection.remote_address, connection.remote_port): - return nyx.connections.conn_entry.Category.EXIT - else: - for circ in controller.get_circuits([]): - if circ.path[0][0] == destination_fingerprint and circ.status == 'BUILT': - # Tor builds one-hop circuits to retrieve directory information. - # If longer this is likely a connection to a guard. + if fingerprint: + for circ in controller.get_circuits([]): + if circ.path[0][0] == fingerprint and circ.status == 'BUILT': + # Tor builds one-hop circuits to retrieve directory information. + # If longer this is likely a connection to a guard. + + return Category.DIRECTORY if len(circ.path) == 1 else Category.CIRCUIT + else: + # not a known relay, might be an exit connection + + exit_policy = controller.get_exit_policy(None) - return nyx.connections.conn_entry.Category.DIRECTORY if len(circ.path) == 1 else nyx.connections.conn_entry.Category.CIRCUIT + if exit_policy and exit_policy.can_exit_to(connection.remote_address, connection.remote_port): + return Category.EXIT - return nyx.connections.conn_entry.Category.OUTBOUND + return Category.OUTBOUND

1 0

[nyx/master] Move Entry classes into the connection_panel
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit fcfd51e6dd0c3972d1c41afefcdfd2a06492bdeb Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 31 10:08:51 2015 -0700 Move Entry classes into the connection_panel Closer! The Entries are now reasonably short and sweet. Not much is now left in entries.py. --- nyx/connection_panel.py | 135 +++++++++++++++++++++++++++++++++++++++-- nyx/connections/entries.py | 142 -------------------------------------------- 2 files changed, 131 insertions(+), 146 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index f2d613e..3ab1bfb 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -12,12 +12,18 @@ import threading import nyx.popups import nyx.util.tracker -from nyx.connections import descriptor_popup, entries +from nyx.connections import descriptor_popup from nyx.util import panel, tor_controller, ui_tools -from stem.control import State +from stem.control import Listener, State from stem.util import conf, connection, enum +try: + # added in python 3.2 + from functools import lru_cache +except ImportError: + from stem.util.lru_cache import lru_cache + # height of the detail panel content, not counting top and bottom border DETAILS_HEIGHT = 7 @@ -84,6 +90,127 @@ CONFIG = conf.config_dict('nyx', { }, conf_handler) +class Entry(object): + @staticmethod + @lru_cache() + def from_connection(connection): + return ConnectionEntry(connection) + + @staticmethod + @lru_cache() + def from_circuit(circuit): + return CircuitEntry(circuit) + + def get_lines(self): + """ + Provides individual lines of connection information. + + :returns: **list** of **ConnectionLine** concerning this entry + """ + + raise NotImplementedError('should be implemented by subclasses') + + def get_type(self): + """ + Provides our best guess at the type of connection this is. + + :returns: **Category** for the connection's type + """ + + raise NotImplementedError('should be implemented by subclasses') + + def is_private(self): + """ + Checks if information about this endpoint should be scrubbed. Relaying + etiquette (and wiretapping laws) say these are bad things to look at so + DON'T CHANGE THIS UNLESS YOU HAVE A DAMN GOOD REASON! + + :returns: **bool** indicating if connection information is sensive or not + """ + + raise NotImplementedError('should be implemented by subclasses') + + +class ConnectionEntry(Entry): + def __init__(self, connection): + self._connection = connection + + @lru_cache() + def get_lines(self): + import nyx.connections.conn_entry + return [nyx.connections.conn_entry.ConnectionLine(self, self._connection)] + + @lru_cache() + def get_type(self): + controller = tor_controller() + + if self._connection.local_port in controller.get_ports(Listener.OR, []): + return Category.INBOUND + elif self._connection.local_port in controller.get_ports(Listener.DIR, []): + return Category.INBOUND + elif self._connection.local_port in controller.get_ports(Listener.SOCKS, []): + return Category.SOCKS + elif self._connection.local_port in controller.get_ports(Listener.CONTROL, []): + return Category.CONTROL + + for hs_config in controller.get_hidden_service_conf({}).values(): + if self._connection.remote_port == hs_config['HiddenServicePort']: + return Category.HIDDEN + + fingerprint = nyx.util.tracker.get_consensus_tracker().get_relay_fingerprint(self._connection.remote_address, self._connection.remote_port) + + if fingerprint: + for circ in controller.get_circuits([]): + if circ.path[0][0] == fingerprint and circ.status == 'BUILT': + # Tor builds one-hop circuits to retrieve directory information. + # If longer this is likely a connection to a guard. + + return Category.DIRECTORY if len(circ.path) == 1 else Category.CIRCUIT + else: + # not a known relay, might be an exit connection + + exit_policy = controller.get_exit_policy(None) + + if exit_policy and exit_policy.can_exit_to(self._connection.remote_address, self._connection.remote_port): + return Category.EXIT + + return Category.OUTBOUND + + @lru_cache() + def is_private(self): + if not CONFIG['features.connection.showIps']: + return True + + if self.get_type() == Category.INBOUND: + controller = tor_controller() + + if controller.is_user_traffic_allowed().inbound: + return len(nyx.util.tracker.get_consensus_tracker().get_all_relay_fingerprints(self._connection.remote_address)) == 0 + elif self.get_type() == Category.EXIT: + # DNS connections exiting us aren't private (since they're hitting our + # resolvers). Everything else is. + + return not (self._connection.remote_port == 53 and self._connection.protocol == 'udp') + + return False # for everything else this isn't a concern + + +class CircuitEntry(Entry): + def __init__(self, circuit): + self._circuit = circuit + + @lru_cache() + def get_lines(self): + from nyx.connections.circ_entry import CircHeaderLine, CircLine + return [CircHeaderLine(self, self._circuit)] + [CircLine(self, self._circuit, fp) for fp, _ in self._circuit.path] + + def get_type(self): + return Category.CIRCUIT + + def is_private(self): + return False + + class ConnectionPanel(panel.Panel, threading.Thread): """ Listing of connections tor is making, with information correlated against @@ -540,14 +667,14 @@ class ConnectionPanel(panel.Panel, threading.Thread): elif current_resolution_count == self._last_resource_fetch: return # no new connections to process - new_entries = [entries.Entry.from_connection(conn) for conn in conn_resolver.get_value()] + new_entries = [Entry.from_connection(conn) for conn in conn_resolver.get_value()] for circ in tor_controller().get_circuits([]): # Skips established single-hop circuits (these are for directory # fetches, not client circuits) if not (circ.status == 'BUILT' and len(circ.path) == 1): - new_entries.append(entries.Entry.from_circuit(circ)) + new_entries.append(Entry.from_circuit(circ)) with self._vals_lock: # update stats for client and exit connections diff --git a/nyx/connections/entries.py b/nyx/connections/entries.py index a372576..57c7e84 100644 --- a/nyx/connections/entries.py +++ b/nyx/connections/entries.py @@ -4,148 +4,6 @@ entry itself (ie, Tor connection, client circuit, etc) and the lines it consists of in the listing. """ -import nyx.util.tracker - -from nyx.util import tor_controller - -from stem.control import Listener -from stem.util import conf - -try: - # added in python 3.2 - from functools import lru_cache -except ImportError: - from stem.util.lru_cache import lru_cache - -CONFIG = conf.config_dict('nyx', { - 'features.connection.showIps': True, -}) - - -class Entry(object): - @staticmethod - @lru_cache() - def from_connection(connection): - return ConnectionEntry(connection) - - @staticmethod - @lru_cache() - def from_circuit(circuit): - return CircuitEntry(circuit) - - def get_lines(self): - """ - Provides individual lines of connection information. - - :returns: **list** of **ConnectionLine** concerning this entry - """ - - raise NotImplementedError('should be implemented by subclasses') - - def get_type(self): - """ - Provides our best guess at the type of connection this is. - - :returns: **Category** for the connection's type - """ - - raise NotImplementedError('should be implemented by subclasses') - - def is_private(self): - """ - Checks if information about this endpoint should be scrubbed. Relaying - etiquette (and wiretapping laws) say these are bad things to look at so - DON'T CHANGE THIS UNLESS YOU HAVE A DAMN GOOD REASON! - - :returns: **bool** indicating if connection information is sensive or not - """ - - raise NotImplementedError('should be implemented by subclasses') - - -class ConnectionEntry(Entry): - def __init__(self, connection): - self._connection = connection - - @lru_cache() - def get_lines(self): - import nyx.connections.conn_entry - return [nyx.connections.conn_entry.ConnectionLine(self, self._connection)] - - @lru_cache() - def get_type(self): - from nyx.connection_panel import Category - controller = tor_controller() - - if self._connection.local_port in controller.get_ports(Listener.OR, []): - return Category.INBOUND - elif self._connection.local_port in controller.get_ports(Listener.DIR, []): - return Category.INBOUND - elif self._connection.local_port in controller.get_ports(Listener.SOCKS, []): - return Category.SOCKS - elif self._connection.local_port in controller.get_ports(Listener.CONTROL, []): - return Category.CONTROL - - for hs_config in controller.get_hidden_service_conf({}).values(): - if self._connection.remote_port == hs_config['HiddenServicePort']: - return Category.HIDDEN - - fingerprint = nyx.util.tracker.get_consensus_tracker().get_relay_fingerprint(self._connection.remote_address, self._connection.remote_port) - - if fingerprint: - for circ in controller.get_circuits([]): - if circ.path[0][0] == fingerprint and circ.status == 'BUILT': - # Tor builds one-hop circuits to retrieve directory information. - # If longer this is likely a connection to a guard. - - return Category.DIRECTORY if len(circ.path) == 1 else Category.CIRCUIT - else: - # not a known relay, might be an exit connection - - exit_policy = controller.get_exit_policy(None) - - if exit_policy and exit_policy.can_exit_to(self._connection.remote_address, self._connection.remote_port): - return Category.EXIT - - return Category.OUTBOUND - - @lru_cache() - def is_private(self): - from nyx.connection_panel import Category - - if not CONFIG['features.connection.showIps']: - return True - - if self.get_type() == Category.INBOUND: - controller = tor_controller() - - if controller.is_user_traffic_allowed().inbound: - return len(nyx.util.tracker.get_consensus_tracker().get_all_relay_fingerprints(self._connection.remote_address)) == 0 - elif self.get_type() == Category.EXIT: - # DNS connections exiting us aren't private (since they're hitting our - # resolvers). Everything else is. - - return not (self._connection.remote_port == 53 and self._connection.protocol == 'udp') - - return False # for everything else this isn't a concern - - -class CircuitEntry(Entry): - def __init__(self, circuit): - self._circuit = circuit - - @lru_cache() - def get_lines(self): - from nyx.connections.circ_entry import CircHeaderLine, CircLine - return [CircHeaderLine(self, self._circuit)] + [CircLine(self, self._circuit, fp) for fp, _ in self._circuit.path] - - def get_type(self): - from nyx.connection_panel import Category - return Category.CIRCUIT - - def is_private(self): - return False - class ConnectionPanelLine: """

1 0

[nyx/master] Drop features.connection.showExitPort
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit e79ac1f3210cd337e51537da0fca3895fc752e56 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 5 14:41:00 2015 -0700 Drop features.connection.showExitPort I've never known of this information to be sensitive, so lets just drop this. We can add it back if someone wants it. --- nyx/connections/conn_entry.py | 9 ++------- nyxrc.sample | 3 --- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index 3ed78a9..df36dd8 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -28,7 +28,6 @@ LABEL_MIN_PADDING = 2 # min space between listing label and following data CONFIG = conf.config_dict('nyx', { 'features.connection.showIps': True, - 'features.connection.showExitPort': True, }) @@ -413,14 +412,10 @@ class ConnectionLine(object): include_locale - possibly includes the locale """ - # the port and port derived data can be hidden by config or without include_port - - include_port = self.include_port and (CONFIG['features.connection.showExitPort'] or self._entry.get_type() != Category.EXIT) - # destination of the connection address_label = '<scrubbed>' if self._entry.is_private() else self.connection.remote_address - port_label = ':%s' % self.connection.remote_port if include_port else '' + port_label = ':%s' % self.connection.remote_port destination_address = address_label + port_label # Only append the extra info if there's at least a couple characters of @@ -429,7 +424,7 @@ class ConnectionLine(object): if len(destination_address) + 5 <= max_length: space_available = max_length - len(destination_address) - 3 - if self._entry.get_type() == Category.EXIT and include_port: + if self._entry.get_type() == Category.EXIT: purpose = connection.port_usage(self.connection.remote_port) if purpose: diff --git a/nyxrc.sample b/nyxrc.sample index d922081..a93ff3b 100644 --- a/nyxrc.sample +++ b/nyxrc.sample @@ -203,14 +203,11 @@ features.graph.bw.accounting.show true # showIps # shows ip addresses for other tor relays, dropping this information if # false -# showExitPort -# shows port related information of exit connections we relay if true features.connection.listingType IP_ADDRESS features.connection.order CATEGORY, LISTING, UPTIME features.connection.resolveApps true features.connection.showIps true -features.connection.showExitPort true # Caching parameters cache.logPanel.size 1000

1 0

[nyx/master] Drop duplicate ListingType enum
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit ca3038beeb313128910970f69e00cce0a3a31c0a Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 31 08:31:19 2015 -0700 Drop duplicate ListingType enum Weird, the panel had a Listing and entries had a ListingType. They're identical so could be used interchangeably, so just dropping the entry's copy. --- nyx/connections/circ_entry.py | 6 +++--- nyx/connections/conn_entry.py | 18 +++++++++++------- nyx/connections/conn_panel.py | 10 +++++----- nyx/connections/entries.py | 4 ---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/nyx/connections/circ_entry.py b/nyx/connections/circ_entry.py index f396385..3cf0147 100644 --- a/nyx/connections/circ_entry.py +++ b/nyx/connections/circ_entry.py @@ -14,7 +14,7 @@ import datetime import nyx.util.tracker import nyx.util.ui_tools -from nyx.connections import entries, conn_entry +from nyx.connections import conn_entry, conn_panel, entries from stem.util import str_tools @@ -139,7 +139,7 @@ class CircLine(conn_entry.ConnectionLine): dst, etc = '', '' - if listing_type == entries.ListingType.IP_ADDRESS: + if listing_type == conn_panel.Listing.IP_ADDRESS: # dst width is derived as: # src (21) + dst (26) + divider (7) + right gap (2) - bracket (3) = 53 char @@ -150,7 +150,7 @@ class CircLine(conn_entry.ConnectionLine): 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 == entries.ListingType.FINGERPRINT: + elif listing_type == conn_panel.Listing.FINGERPRINT: # dst width is derived as: # src (9) + dst (40) + divider (7) + right gap (2) - bracket (3) = 55 char diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index 40a626f..b2fe648 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -102,17 +102,17 @@ class ConnectionLine(entries.ConnectionPanelLine): of the following components: <src> --> <dst> <etc> <uptime> (<type>) - ListingType.IP_ADDRESS: + Listing.IP_ADDRESS: src - <internal addr:port> --> <external addr:port> dst - <destination addr:port> etc - <fingerprint> <nickname> - ListingType.FINGERPRINT: + Listing.FINGERPRINT: src - localhost dst - <destination fingerprint> etc - <nickname> <destination addr:port> - ListingType.NICKNAME: + Listing.NICKNAME: src - <source nickname> dst - <destination nickname> etc - <fingerprint> <destination addr:port> @@ -184,6 +184,8 @@ class ConnectionLine(entries.ConnectionPanelLine): listing_type - primary attribute we're listing connections by """ + from nyx.connections import conn_panel + # for applications show the command/pid if self._entry.get_type() in (Category.SOCKS, Category.HIDDEN, Category.CONTROL): @@ -207,7 +209,7 @@ class ConnectionLine(entries.ConnectionPanelLine): destination_address = self.get_destination_label(26, include_locale = True) etc, used_space = '', 0 - if listing_type == entries.ListingType.IP_ADDRESS: + if listing_type == conn_panel.Listing.IP_ADDRESS: if width > used_space + 42 and CONFIG['features.connection.showColumn.fingerprint']: # show fingerprint (column width: 42 characters) @@ -221,7 +223,7 @@ class ConnectionLine(entries.ConnectionPanelLine): nickname_label = str_tools.crop(self.get_nickname('UNKNOWN'), nickname_space, 0) etc += ('%%-%is ' % nickname_space) % nickname_label used_space += nickname_space + 2 - elif listing_type == entries.ListingType.FINGERPRINT: + elif listing_type == conn_panel.Listing.FINGERPRINT: if width > used_space + 17: # show nickname (column width: min 17 characters, consumes any remaining space) @@ -266,6 +268,8 @@ class ConnectionLine(entries.ConnectionPanelLine): listing_type - primary attribute we're listing connections by """ + from nyx.connections import conn_panel + controller = tor_controller() my_type = self._entry.get_type() destination_address = self.get_destination_label(26, include_locale = True) @@ -280,7 +284,7 @@ class ConnectionLine(entries.ConnectionPanelLine): src, dst, etc = '', '', '' - if listing_type == entries.ListingType.IP_ADDRESS: + if listing_type == conn_panel.Listing.IP_ADDRESS: my_external_address = controller.get_info('address', self.connection.local_address) address_differ = my_external_address != self.connection.local_address @@ -340,7 +344,7 @@ class ConnectionLine(entries.ConnectionPanelLine): etc = self.get_etc_content(width - used_space, listing_type) used_space += len(etc) - elif listing_type == entries.ListingType.FINGERPRINT: + elif listing_type == conn_panel.Listing.FINGERPRINT: src = 'localhost' if my_type == Category.CONTROL: diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py index f28c943..57c2efb 100644 --- a/nyx/connections/conn_panel.py +++ b/nyx/connections/conn_panel.py @@ -160,11 +160,11 @@ class ConnectionPanel(panel.Panel, threading.Thread): def sort_value(entry, attr): if attr == entries.SortAttr.LISTING: - if self.get_listing_type() == entries.ListingType.IP_ADDRESS: + if self.get_listing_type() == Listing.IP_ADDRESS: attr = entries.SortAttr.IP_ADDRESS - elif self.get_listing_type() == entries.ListingType.FINGERPRINT: + elif self.get_listing_type() == Listing.FINGERPRINT: attr = entries.SortAttr.FINGERPRINT - elif self.get_listing_type() == entries.ListingType.NICKNAME: + elif self.get_listing_type() == Listing.NICKNAME: attr = entries.SortAttr.NICKNAME connection_line = entry.get_lines()[0] @@ -284,7 +284,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): # provides a menu to pick the primary information we list connections by title = 'List By:' - options = list(entries.ListingType) + options = list(Listing) old_selection = options.index(self.get_listing_type()) selection = nyx.popups.show_menu(title, options, old_selection) @@ -303,7 +303,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): if not selection: break - color = nyx.connections.conn_entry.CATEGORY_COLOR[selection.get_type()] + color = conn_entry.CATEGORY_COLOR[selection.get_type()] 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 = descriptor_popup.show_descriptor_popup(fingerprint, color, self.max_x, is_close_key) diff --git a/nyx/connections/entries.py b/nyx/connections/entries.py index 20d19a8..91994bc 100644 --- a/nyx/connections/entries.py +++ b/nyx/connections/entries.py @@ -17,10 +17,6 @@ try: except ImportError: from stem.util.lru_cache import lru_cache -# attributes we can list entries by - -ListingType = enum.Enum(('IP_ADDRESS', 'IP Address'), 'FINGERPRINT', 'NICKNAME') - SortAttr = enum.Enum('CATEGORY', 'UPTIME', 'LISTING', 'IP_ADDRESS', 'PORT', 'FINGERPRINT', 'NICKNAME', 'COUNTRY') SORT_COLORS = {

1 0

[nyx/master] Drop markInitialConnections config option
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 86d593f6dad88ac1408b5b4ce8b12d678b3a839c Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Sep 2 10:04:08 2015 -0700 Drop markInitialConnections config option Don't see a reason anyone would want to toggle this - it's used to indicate when connections predate nyx, that's all. --- nyx/connection_panel.py | 16 +++++++++------- nyx/connections/conn_entry.py | 39 ++++++++------------------------------- nyxrc.sample | 5 ----- 3 files changed, 17 insertions(+), 43 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index 3ab1bfb..c583a00 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -678,18 +678,20 @@ class ConnectionPanel(panel.Panel, threading.Thread): with self._vals_lock: # update stats for client and exit connections + # TODO: this is counting connections each time they're resolved - totally broken :( for entry in new_entries: entry_line = entry.get_lines()[0] - if entry.is_private() and entry.get_type() == Category.INBOUND: - client_locale = entry_line.get_locale(None) + 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 - 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 + if client_locale: + self._client_locale_usage[client_locale] = self._client_locale_usage.get(client_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 self._entries, self._entry_lines = new_entries, list(itertools.chain.from_iterable([entry.get_lines() for entry in new_entries])) diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index 34e34d9..37fb59c 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -27,7 +27,6 @@ LABEL_FORMAT = '%s --> %s %s%s' LABEL_MIN_PADDING = 2 # min space between listing label and following data CONFIG = conf.config_dict('nyx', { - 'features.connection.markInitialConnections': True, 'features.connection.showIps': True, 'features.connection.showExitPort': True, 'features.connection.showColumn.fingerprint': True, @@ -119,10 +118,7 @@ class ConnectionLine(object): # fill in the current uptime and return the results - if CONFIG['features.connection.markInitialConnections']: - time_prefix = '+' if self.connection.is_legacy else ' ' - else: - time_prefix = '' + time_prefix = '+' if self.connection.is_legacy else ' ' time_label = time_prefix + '%5s' % str_tools.time_label(current_time - self.connection.start_time, 1) my_listing[2] = (time_label, my_listing[2][1]) @@ -142,11 +138,10 @@ class ConnectionLine(object): # postType - ") " line_format = nyx.util.ui_tools.get_color(nyx.connection_panel.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), + (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)] @@ -333,13 +328,7 @@ class ConnectionLine(object): used_space += len(etc) elif listing_type == nyx.connection_panel.Listing.FINGERPRINT: src = 'localhost' - - if my_type == Category.CONTROL: - dst = 'localhost' - else: - dst = self.get_fingerprint('UNKNOWN') - - dst = '%-40s' % dst + dst = '%-40s' % ('localhost' if my_type == Category.CONTROL else self.get_fingerprint('UNKNOWN')) used_space += len(src) + len(dst) # base data requires 49 characters @@ -348,11 +337,7 @@ class ConnectionLine(object): else: # base data requires 50 min characters src = controller.get_conf('nickname', 'UNKNOWN') - - if my_type == Category.CONTROL: - dst = controller.get_conf('nickname', 'UNKNOWN') - else: - dst = self.get_nickname('UNKNOWN') + dst = controller.get_conf('nickname', 'UNKNOWN') if my_type == Category.CONTROL else self.get_nickname('UNKNOWN') min_base_space = 50 @@ -430,16 +415,9 @@ class ConnectionLine(object): if len(ns_lines) >= 2 and ns_lines[1].startswith('s '): flags = ns_lines[1][2:] - exit_policy = None descriptor = controller.get_server_descriptor(fingerprint, None) - - if descriptor: - exit_policy = descriptor.exit_policy - - if exit_policy: - policy_label = exit_policy.summary() - else: - policy_label = 'unknown' + exit_policy = descriptor.exit_policy if descriptor else None + policy_label = exit_policy.summary() if exit_policy else 'unknown' dir_port_label = '' if dir_port == '0' else 'dirport: %s' % dir_port lines[2] = 'nickname: %-25s orport: %-10s %s' % (nickname, or_port, dir_port_label) @@ -560,9 +538,8 @@ class ConnectionLine(object): destination_address += ' (%s)' % purpose elif not connection.is_private_address(self.connection.remote_address): extra_info = [] - controller = tor_controller() - if include_locale and not controller.is_geoip_unavailable(): + 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 diff --git a/nyxrc.sample b/nyxrc.sample index aae13dc..e453320 100644 --- a/nyxrc.sample +++ b/nyxrc.sample @@ -200,10 +200,6 @@ features.graph.bw.accounting.show true # resolveApps # issues lsof queries to determining the applications involved in local # SOCKS and CONTROL connections -# markInitialConnections -# if true, the uptime of the initial connections when we start are marked -# with a '+' (these uptimes are estimates since nyx can only track a -# connection's duration while it runs) # showIps # shows ip addresses for other tor relays, dropping this information if # false @@ -215,7 +211,6 @@ features.graph.bw.accounting.show true features.connection.listingType IP_ADDRESS features.connection.order CATEGORY, LISTING, UPTIME features.connection.resolveApps true -features.connection.markInitialConnections true features.connection.showIps true features.connection.showExitPort true features.connection.showColumn.fingerprint true

1 0

[nyx/master] Move SortAttr to the panel
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 858cbb6f0e3c057dca90329e4352018dbf34eb5b Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 31 08:34:40 2015 -0700 Move SortAttr to the panel All usage of the enum is now in the panel, so no reason for it to be split into the entries. --- nyx/connections/conn_panel.py | 51 ++++++++++++++++++++++++++--------------- nyx/connections/entries.py | 15 +----------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py index 57c2efb..2f6fde3 100644 --- a/nyx/connections/conn_panel.py +++ b/nyx/connections/conn_panel.py @@ -29,21 +29,34 @@ Listing = enum.Enum(('IP_ADDRESS', 'IP Address'), 'FINGERPRINT', 'NICKNAME') EXIT_USAGE_WIDTH = 15 UPDATE_RATE = 5 # rate in seconds at which we refresh +SortAttr = enum.Enum('CATEGORY', 'UPTIME', 'LISTING', 'IP_ADDRESS', 'PORT', 'FINGERPRINT', 'NICKNAME', 'COUNTRY') + +SORT_COLORS = { + SortAttr.CATEGORY: 'red', + SortAttr.UPTIME: 'yellow', + SortAttr.LISTING: 'green', + SortAttr.IP_ADDRESS: 'blue', + SortAttr.PORT: 'blue', + SortAttr.FINGERPRINT: 'cyan', + SortAttr.NICKNAME: 'cyan', + SortAttr.COUNTRY: 'blue', +} + def conf_handler(key, value): if key == 'features.connection.listing_type': return conf.parse_enum(key, value, Listing) elif key == 'features.connection.order': - return conf.parse_enum_csv(key, value[0], entries.SortAttr, 3) + return conf.parse_enum_csv(key, value[0], SortAttr, 3) CONFIG = conf.config_dict('nyx', { 'features.connection.resolveApps': True, 'features.connection.listing_type': Listing.IP_ADDRESS, 'features.connection.order': [ - entries.SortAttr.CATEGORY, - entries.SortAttr.LISTING, - entries.SortAttr.UPTIME], + SortAttr.CATEGORY, + SortAttr.LISTING, + SortAttr.UPTIME], 'features.connection.showIps': True, }, conf_handler) @@ -155,21 +168,21 @@ class ConnectionPanel(panel.Panel, threading.Thread): if ordering: nyx_config = conf.get_config('nyx') - ordering_keys = [entries.SortAttr.keys()[entries.SortAttr.index_of(v)] for v in ordering] + ordering_keys = [SortAttr.keys()[SortAttr.index_of(v)] for v in ordering] nyx_config.set('features.connection.order', ', '.join(ordering_keys)) def sort_value(entry, attr): - if attr == entries.SortAttr.LISTING: + if attr == SortAttr.LISTING: if self.get_listing_type() == Listing.IP_ADDRESS: - attr = entries.SortAttr.IP_ADDRESS + attr = SortAttr.IP_ADDRESS elif self.get_listing_type() == Listing.FINGERPRINT: - attr = entries.SortAttr.FINGERPRINT + attr = SortAttr.FINGERPRINT elif self.get_listing_type() == Listing.NICKNAME: - attr = entries.SortAttr.NICKNAME + attr = SortAttr.NICKNAME connection_line = entry.get_lines()[0] - if attr == entries.SortAttr.IP_ADDRESS: + if attr == SortAttr.IP_ADDRESS: if entry.is_private(): return 255 ** 4 # orders at the end @@ -179,17 +192,17 @@ class ConnectionPanel(panel.Panel, threading.Thread): ip_value = ip_value * 255 + int(octet) return ip_value * 65536 + connection_line.connection.remote_port - elif attr == entries.SortAttr.PORT: + elif attr == SortAttr.PORT: return connection_line.connection.remote_port - elif attr == entries.SortAttr.FINGERPRINT: + elif attr == SortAttr.FINGERPRINT: return connection_line.get_fingerprint('UNKNOWN') - elif attr == entries.SortAttr.NICKNAME: + elif attr == SortAttr.NICKNAME: return connection_line.get_nickname('z' * 20) - elif attr == entries.SortAttr.CATEGORY: + elif attr == SortAttr.CATEGORY: return conn_entry.Category.index_of(entry.get_type()) - elif attr == entries.SortAttr.UPTIME: + elif attr == SortAttr.UPTIME: return connection_line.connection.start_time - elif attr == entries.SortAttr.COUNTRY: + elif attr == SortAttr.COUNTRY: return '' if entry.is_private() else connection_line.get_locale('') else: return '' @@ -221,7 +234,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): # if we're sorting by the listing then we need to resort - if entries.SortAttr.LISTING in CONFIG['features.connection.order']: + if SortAttr.LISTING in CONFIG['features.connection.order']: self.set_sort_order() def show_sort_dialog(self): @@ -232,9 +245,9 @@ class ConnectionPanel(panel.Panel, threading.Thread): # set ordering for connection options title_label = 'Connection Ordering:' - options = list(entries.SortAttr) + options = list(SortAttr) old_selection = CONFIG['features.connection.order'] - option_colors = dict([(attr, entries.SORT_COLORS[attr]) for attr in options]) + option_colors = dict([(attr, SORT_COLORS[attr]) for attr in options]) results = nyx.popups.show_sort_dialog(title_label, options, old_selection, option_colors) if results: diff --git a/nyx/connections/entries.py b/nyx/connections/entries.py index 91994bc..4c6fa9c 100644 --- a/nyx/connections/entries.py +++ b/nyx/connections/entries.py @@ -9,7 +9,7 @@ import nyx.util.tracker from nyx.util import tor_controller from stem.control import Listener -from stem.util import conf, enum +from stem.util import conf try: # added in python 3.2 @@ -17,19 +17,6 @@ try: except ImportError: from stem.util.lru_cache import lru_cache -SortAttr = enum.Enum('CATEGORY', 'UPTIME', 'LISTING', 'IP_ADDRESS', 'PORT', 'FINGERPRINT', 'NICKNAME', 'COUNTRY') - -SORT_COLORS = { - SortAttr.CATEGORY: 'red', - SortAttr.UPTIME: 'yellow', - SortAttr.LISTING: 'green', - SortAttr.IP_ADDRESS: 'blue', - SortAttr.PORT: 'blue', - SortAttr.FINGERPRINT: 'cyan', - SortAttr.NICKNAME: 'cyan', - SortAttr.COUNTRY: 'blue', -} - CONFIG = conf.config_dict('nyx', { 'features.connection.showIps': True, })

1 0

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

22 Sep '15

commit 5f1eae854617f42b15b8dffcff953a49b2076467 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 31 10:22:03 2015 -0700 Drop nyx.connections.entries Moving the last class to conn_enties, and dropping the submodule. --- nyx/connections/circ_entry.py | 4 +-- nyx/connections/conn_entry.py | 71 ++++++++++++++++++++++++++++++++++++++--- nyx/connections/entries.py | 69 --------------------------------------- 3 files changed, 69 insertions(+), 75 deletions(-) diff --git a/nyx/connections/circ_entry.py b/nyx/connections/circ_entry.py index d2b1ef6..7cf087f 100644 --- a/nyx/connections/circ_entry.py +++ b/nyx/connections/circ_entry.py @@ -15,7 +15,7 @@ import nyx.util.tracker import nyx.util.ui_tools import nyx.connection_panel -from nyx.connections import conn_entry, entries +from nyx.connections import conn_entry from stem.util import str_tools @@ -125,7 +125,7 @@ class CircLine(conn_entry.ConnectionLine): listing_type - primary attribute we're listing connections by """ - return entries.ConnectionPanelLine.get_listing_entry(self, width, current_time, listing_type) + return conn_entry.ConnectionPanelLine.get_listing_entry(self, width, current_time, listing_type) def _get_listing_entry(self, width, current_time, listing_type): line_format = nyx.util.ui_tools.get_color(nyx.connection_panel.CATEGORY_COLOR[self._entry.get_type()]) diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index 1f26f4c..366ecba 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -10,7 +10,6 @@ import nyx.util.tracker import nyx.util.ui_tools from nyx.util import tor_controller -from nyx.connections import entries from nyx.connection_panel import Category from stem.util import conf, connection, str_tools @@ -32,13 +31,77 @@ CONFIG = conf.config_dict('nyx', { }) -class ConnectionLine(entries.ConnectionPanelLine): +class ConnectionPanelLine: + """ + Individual line in the connection panel listing. + """ + + def __init__(self): + # cache for displayed information + self._listing_cache = None + self._listing_cache_args = (None, None) + + self._details_cache = None + self._details_cache_args = None + + self._descriptor_cache = None + self._descriptor_cache_args = None + + def get_listing_prefix(self): + """ + Provides a list of characters to be appended before the listing entry. + """ + + return () + + def get_listing_entry(self, width, current_time, listing_type): + """ + Provides a [(msg, attr)...] tuple list for contents to be displayed in the + connection panel listing. + + Arguments: + width - available space to display in + current_time - unix timestamp for what the results should consider to be + the current time (this may be ignored due to caching) + """ + + if self._listing_cache_args != (width, listing_type): + self._listing_cache = self._get_listing_entry(width, current_time, listing_type) + self._listing_cache_args = (width, listing_type) + + return self._listing_cache + + def _get_listing_entry(self, width, current_time, listing_type): + # implementation of get_listing_entry + return None + + def get_details(self, width): + """ + Provides a list of [(msg, attr)...] tuple listings with detailed + information for this connection. + + Arguments: + width - available space to display in + """ + + if self._details_cache_args != width: + self._details_cache = self._get_details(width) + self._details_cache_args = width + + return self._details_cache + + def _get_details(self, width): + # implementation of get_details + return [] + + +class ConnectionLine(ConnectionPanelLine): """ Display component of the ConnectionEntry. """ def __init__(self, entry, conn, include_port=True, include_expanded_addresses=True): - entries.ConnectionPanelLine.__init__(self) + ConnectionPanelLine.__init__(self) self._entry = entry self.connection = conn @@ -105,7 +168,7 @@ class ConnectionLine(entries.ConnectionPanelLine): # fetch our (most likely cached) display entry for the listing - my_listing = entries.ConnectionPanelLine.get_listing_entry(self, width, current_time, listing_type) + my_listing = ConnectionPanelLine.get_listing_entry(self, width, current_time, listing_type) # fill in the current uptime and return the results diff --git a/nyx/connections/entries.py b/nyx/connections/entries.py deleted file mode 100644 index 57c7e84..0000000 --- a/nyx/connections/entries.py +++ /dev/null @@ -1,69 +0,0 @@ -""" -Interface for entries in the connection panel. These consist of two parts: the -entry itself (ie, Tor connection, client circuit, etc) and the lines it -consists of in the listing. -""" - - -class ConnectionPanelLine: - """ - Individual line in the connection panel listing. - """ - - def __init__(self): - # cache for displayed information - self._listing_cache = None - self._listing_cache_args = (None, None) - - self._details_cache = None - self._details_cache_args = None - - self._descriptor_cache = None - self._descriptor_cache_args = None - - def get_listing_prefix(self): - """ - Provides a list of characters to be appended before the listing entry. - """ - - return () - - def get_listing_entry(self, width, current_time, listing_type): - """ - Provides a [(msg, attr)...] tuple list for contents to be displayed in the - connection panel listing. - - Arguments: - width - available space to display in - current_time - unix timestamp for what the results should consider to be - the current time (this may be ignored due to caching) - """ - - if self._listing_cache_args != (width, listing_type): - self._listing_cache = self._get_listing_entry(width, current_time, listing_type) - self._listing_cache_args = (width, listing_type) - - return self._listing_cache - - def _get_listing_entry(self, width, current_time, listing_type): - # implementation of get_listing_entry - return None - - def get_details(self, width): - """ - Provides a list of [(msg, attr)...] tuple listings with detailed - information for this connection. - - Arguments: - width - available space to display in - """ - - if self._details_cache_args != width: - self._details_cache = self._get_details(width) - self._details_cache_args = width - - return self._details_cache - - def _get_details(self, width): - # implementation of get_details - return []

1 0

[nyx/master] Rewrite how we handle connection details
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit ed2b57107c30e913c31283e1fbcae38f7ce10f3b Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 6 12:09:30 2015 -0700 Rewrite how we handle connection details When the user presses 'enter' we show a subdialog with more detailed information. Rewriting how we do this, pulling display logic from ConnectionLine into a draw submethod. This also simplifies our connection tracker, merging get_relay_fingerprint() and get_all_relay_fingerprints(). --- nyx/__init__.py | 1 + nyx/connection_panel.py | 243 ++++++++++++++++++----------------------------- nyx/log_panel.py | 10 +- nyx/util/tracker.py | 41 ++------ 4 files changed, 105 insertions(+), 190 deletions(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index 65e3c71..078955d 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -12,6 +12,7 @@ __license__ = 'GPLv3' __all__ = [ 'arguments', 'config_panel', + 'connection_panel', 'controller', 'header_panel', 'log_panel', diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index f133ff8..92d4fed 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -146,7 +146,7 @@ class ConnectionEntry(Entry): if self._connection.remote_port == hs_config['HiddenServicePort']: return Category.HIDDEN - fingerprint = nyx.util.tracker.get_consensus_tracker().get_relay_fingerprint(self._connection.remote_address, self._connection.remote_port) + fingerprint = nyx.util.tracker.get_consensus_tracker().get_relay_fingerprints(self._connection.remote_address).get(self._connection.remote_port) if fingerprint: for circ in controller.get_circuits([]): @@ -174,7 +174,7 @@ class ConnectionEntry(Entry): controller = tor_controller() if controller.is_user_traffic_allowed().inbound: - return len(nyx.util.tracker.get_consensus_tracker().get_all_relay_fingerprints(self._connection.remote_address)) == 0 + return len(nyx.util.tracker.get_consensus_tracker().get_relay_fingerprints(self._connection.remote_address)) == 0 elif self.get_type() == Category.EXIT: # DNS connections exiting us aren't private (since they're hitting our # resolvers). Everything else is. @@ -233,7 +233,7 @@ class ConnectionLine(object): """ if self._entry.get_type() in (Category.OUTBOUND, Category.CIRCUIT, Category.DIRECTORY, Category.EXIT): - my_fingerprint = nyx.util.tracker.get_consensus_tracker().get_relay_fingerprint(self.connection.remote_address, self.connection.remote_port) + 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 @@ -310,19 +310,6 @@ class ConnectionLine(object): return draw_entry - @lru_cache() - def get_details(self, width): - """ - Provides details on the connection, correlated against available consensus - data. - - Arguments: - width - available space to display in - """ - - detail_format = (curses.A_BOLD, CONFIG['attr.connection.category_color'].get(self._entry.get_type(), 'white')) - return [(line, detail_format) for line in self._get_detail_content(width)] - def get_etc_content(self, width, listing_type): """ Provides the optional content for the connection. @@ -488,82 +475,6 @@ class ConnectionLine(object): return LABEL_FORMAT % (src, dst, etc, padding) - def _get_detail_content(self, width): - """ - Provides a list with detailed information for this connection. - - Arguments: - width - max length of lines - """ - - lines = [''] * 7 - lines[0] = 'address: %s' % self.get_destination_label(width - 11) - lines[1] = 'locale: %s' % ('??' if self._entry.is_private() else self.get_locale('??')) - - # Remaining data concerns the consensus results, with three possible cases: - # - if there's a single match then display its details - # - if there's multiple potential relays then list all of the combinations - # of ORPorts / Fingerprints - # - if no consensus data is available then say so (probably a client or - # exit connection) - - fingerprint = self.get_fingerprint() - controller = tor_controller() - - if fingerprint: - lines[1] = '%-13sfingerprint: %s' % (lines[1], fingerprint) # append fingerprint to second line - - router_status_entry = controller.get_network_status(fingerprint, None) - server_descriptor = controller.get_server_descriptor(fingerprint, None) - - if router_status_entry: - dir_port_label = 'dirport: %s' % router_status_entry.dir_port if router_status_entry.dir_port else '' - lines[2] = 'nickname: %-25s orport: %-10s %s' % (router_status_entry.nickname, router_status_entry.or_port, dir_port_label) - lines[3] = 'published: %s' % router_status_entry.published.strftime("%H:%M %m/%d/%Y") - lines[4] = 'flags: %s' % ', '.join(router_status_entry.flags) - - if server_descriptor: - policy_label = server_descriptor.exit_policy.summary() if server_descriptor.exit_policy else 'unknown' - lines[5] = 'exit policy: %s' % policy_label - lines[3] = '%-35s os: %-14s version: %s' % (lines[3], server_descriptor.operating_system, server_descriptor.tor_version) - - if server_descriptor.contact: - lines[6] = 'contact: %s' % server_descriptor.contact - else: - all_matches = nyx.util.tracker.get_consensus_tracker().get_all_relay_fingerprints(self.connection.remote_address) - - if all_matches: - # multiple matches - lines[2] = 'Multiple matches, possible fingerprints are:' - - for i in range(len(all_matches)): - is_last_line = i == 3 - - relay_port, relay_fingerprint = all_matches[i] - line_text = '%i. or port: %-5s fingerprint: %s' % (i + 1, relay_port, relay_fingerprint) - - # if there's multiple lines remaining at the end then give a count - - remaining_relays = len(all_matches) - i - - if is_last_line and remaining_relays > 1: - line_text = '... %i more' % remaining_relays - - lines[3 + i] = line_text - - if is_last_line: - break - else: - # no consensus entry for this ip address - lines[2] = 'No consensus data found' - - # crops any lines that are too long - - for i in range(len(lines)): - lines[i] = str_tools.crop(lines[i], width - 2) - - return lines - def get_destination_label(self, max_length, include_locale = False): """ Provides a short description of the destination. This is made up of two @@ -665,14 +576,6 @@ class CircHeaderLine(ConnectionLine): return '' - @lru_cache() - def get_details(self, width): - if not self.is_built: - detail_format = (curses.A_BOLD, CONFIG['attr.connection.category_color'].get(self._entry.get_type(), 'white')) - return [('Building Circuit...', detail_format)] - else: - return ConnectionLine.get_details(self, width) - class CircLine(ConnectionLine): """ @@ -791,7 +694,6 @@ class ConnectionPanel(panel.Panel, threading.Thread): self._scroller = ui_tools.Scroller(True) self._entries = [] # last fetched display entries - self._entry_lines = [] # individual lines rendered from the entries listing self._show_details = False # presents the details panel if true self._last_update = -1 # time the content was last revised @@ -915,7 +817,6 @@ class ConnectionPanel(panel.Panel, threading.Thread): return '' self._entries.sort(key = lambda i: [sort_value(i, attr) for attr in CONFIG['features.connection.order']]) - self._entry_lines = list(itertools.chain.from_iterable([entry.get_lines() for entry in self._entries])) def get_listing_type(self): """ @@ -970,7 +871,8 @@ class ConnectionPanel(panel.Panel, threading.Thread): if self._show_details: page_height -= (DETAILS_HEIGHT + 1) - is_changed = self._scroller.handle_key(key, self._entry_lines, page_height) + lines = list(itertools.chain.from_iterable([entry.get_lines() for entry in self._entries])) + is_changed = self._scroller.handle_key(key, lines, page_height) if is_changed: self.redraw(True) @@ -1018,7 +920,8 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.redraw(True) while True: - selection = self.get_selection() + lines = list(itertools.chain.from_iterable([entry.get_lines() for entry in self._entries])) + selection = self._scroller.get_cursor_selection(lines) if not selection: break @@ -1109,68 +1012,40 @@ class ConnectionPanel(panel.Panel, threading.Thread): return options - def get_selection(self): - """ - Provides the currently selected connection entry. - """ - - return self._scroller.get_cursor_selection(self._entry_lines) - def draw(self, width, height): with self._vals_lock: - # if we don't have any contents then refuse to show details - - if not self._entries: - self._show_details = False - - # extra line when showing the detail panel is for the bottom border - - detail_panel_offset = DETAILS_HEIGHT + 1 if self._show_details else 0 - is_scrollbar_visible = len(self._entry_lines) > height - detail_panel_offset - 1 - - scroll_location = self._scroller.get_scroll_location(self._entry_lines, height - detail_panel_offset - 1) - cursor_selection = self.get_selection() - - # draws the detail panel if currently displaying it + lines = list(itertools.chain.from_iterable([entry.get_lines() for entry in self._entries])) + selected = self._scroller.get_cursor_selection(lines) - if self._show_details and cursor_selection: - # This is a solid border unless the scrollbar is visible, in which case a - # 'T' pipe connects the border to the bar. - - ui_tools.draw_box(self, 0, 0, width, DETAILS_HEIGHT + 2) - - if is_scrollbar_visible: - self.addch(DETAILS_HEIGHT + 1, 1, curses.ACS_TTEE) - - draw_entries = cursor_selection.get_details(width) - - for i in range(min(len(draw_entries), DETAILS_HEIGHT)): - self.addstr(1 + i, 2, draw_entries[i][0], *draw_entries[i][1]) - - # title label with connection counts + details_offset = DETAILS_HEIGHT + 1 if self._show_details else 0 + is_scrollbar_visible = len(lines) > height - details_offset - 1 + scroll_location = self._scroller.get_scroll_location(lines, height - details_offset - 1) if self.is_title_visible(): - self._draw_title(self._entries) + self._draw_title(self._entries, self._show_details) + + if self._show_details and selected: + self._draw_details(selected, width, is_scrollbar_visible) scroll_offset = 0 if is_scrollbar_visible: scroll_offset = 2 - self.add_scroll_bar(scroll_location, scroll_location + height - detail_panel_offset - 1, len(self._entry_lines), 1 + detail_panel_offset) + self.add_scroll_bar(scroll_location, scroll_location + height - details_offset - 1, len(lines), 1 + details_offset) if self.is_paused() or not self._is_tor_running: current_time = self.get_pause_time() else: current_time = time.time() - for line_number in range(scroll_location, len(self._entry_lines)): - entry_line = self._entry_lines[line_number] + for line_number in range(scroll_location, len(lines)): + entry_line = lines[line_number] # hilighting if this is the selected line - extra_format = curses.A_STANDOUT if entry_line == cursor_selection else curses.A_NORMAL + extra_format = curses.A_STANDOUT if entry_line == selected else curses.A_NORMAL - draw_line = line_number + detail_panel_offset + 1 - scroll_location + draw_line = line_number + details_offset + 1 - scroll_location prefix = entry_line.get_listing_prefix() @@ -1188,17 +1063,79 @@ class ConnectionPanel(panel.Panel, threading.Thread): if draw_line >= height: break - def _draw_title(self, entries): - if self._show_details: - title = 'Connection Details:' + def _draw_title(self, entries, showing_details): + """ + Panel title with the number of connections we presently have. + """ + + if showing_details: + self.addstr(0, 0, 'Connection Details:', curses.A_STANDOUT) elif not entries: - title = 'Connections:' + self.addstr(0, 0, 'Connections:', curses.A_STANDOUT) else: counts = collections.Counter([entry.get_type() for entry in entries]) count_labels = ['%i %s' % (counts[category], category.lower()) for category in Category if counts[category]] - title = 'Connections (%s):' % ', '.join(count_labels) + self.addstr(0, 0, 'Connections (%s):' % ', '.join(count_labels), curses.A_STANDOUT) + + def _draw_details(self, selected, width, is_scrollbar_visible): + """ + Shows detailed information about the selected connection. + """ + + attr = (CONFIG['attr.connection.category_color'].get(selected._entry.get_type(), 'white'), curses.A_BOLD) + + 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) + 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) + + if not matches: + self.addstr(3, 2, 'No consensus data found', *attr) + elif len(matches) == 1 or selected.connection.remote_port in matches: + controller = tor_controller() + fingerprint = matches.values()[0] if len(matches) == 1 else matches[selected.connection.remote_port] + router_status_entry = controller.get_network_status(fingerprint, None) + + self.addstr(2, 15, 'fingerprint: %s' % fingerprint, *attr) + + if router_status_entry: + dir_port_label = 'dirport: %s' % router_status_entry.dir_port if router_status_entry.dir_port else '' + self.addstr(3, 2, 'nickname: %-25s orport: %-10s %s' % (router_status_entry.nickname, router_status_entry.or_port, dir_port_label), *attr) + self.addstr(4, 2, 'published: %s' % router_status_entry.published.strftime("%H:%M %m/%d/%Y"), *attr) + self.addstr(5, 2, 'flags: %s' % ', '.join(router_status_entry.flags), *attr) + + server_descriptor = controller.get_server_descriptor(fingerprint, None) + + if server_descriptor: + policy_label = server_descriptor.exit_policy.summary() if server_descriptor.exit_policy else 'unknown' + self.addstr(6, 2, 'exit policy: %s' % policy_label, *attr) + self.addstr(4, 38, 'os: %-14s version: %s' % (server_descriptor.operating_system, server_descriptor.tor_version), *attr) + + if server_descriptor.contact: + self.addstr(7, 2, 'contact: %s' % server_descriptor.contact, *attr) + else: + self.addstr(3, 2, 'Multiple matches, possible fingerprints are:', *attr) + + for i, port in enumerate(sorted(matches.keys())): + is_last_line, remaining_relays = i == 3, len(matches) - i + + if not is_last_line or remaining_relays == 1: + self.addstr(4 + i, 2, '%i. or port: %-5s fingerprint: %s' % (i + 1, port, matches[port]), *attr) + else: + self.addstr(4 + i, 2, '... %i more' % remaining_relays, *attr) + + if is_last_line: + break + + # draw the border, with a 'T' pipe if connecting with the scrollbar + + ui_tools.draw_box(self, 0, 0, width, DETAILS_HEIGHT + 2) - self.addstr(0, 0, title, curses.A_STANDOUT) + if is_scrollbar_visible: + self.addch(DETAILS_HEIGHT + 1, 1, curses.ACS_TTEE) def stop(self): """ @@ -1248,7 +1185,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, self._entry_lines = new_entries, list(itertools.chain.from_iterable([entry.get_lines() for entry in new_entries])) + self._entries = new_entries self.set_sort_order() self._last_resource_fetch = current_resolution_count diff --git a/nyx/log_panel.py b/nyx/log_panel.py index 4912cd7..dedfc99 100644 --- a/nyx/log_panel.py +++ b/nyx/log_panel.py @@ -281,12 +281,12 @@ class LogPanel(panel.Panel, threading.Thread): last_content_height = int(self._last_content_height) show_duplicates = self._show_duplicates - is_scroll_bar_visible = last_content_height > height - 1 + is_scrollbar_visible = last_content_height > height - 1 - if is_scroll_bar_visible: + if is_scrollbar_visible: self.add_scroll_bar(scroll, scroll + height - 1, last_content_height, 1) - x, y = 3 if is_scroll_bar_visible else 1, 1 - scroll + x, y = 3 if is_scrollbar_visible else 1, 1 - scroll # group entries by date, filtering out those that aren't visible @@ -333,9 +333,9 @@ class LogPanel(panel.Panel, threading.Thread): force_redraw_reason = 'estimate was off by %i' % content_height_delta elif new_content_height > height and self._scroll + height - 1 > new_content_height: force_redraw_reason = 'scrolled off the bottom of the page' - elif not is_scroll_bar_visible and new_content_height > height - 1: + elif not is_scrollbar_visible and new_content_height > height - 1: force_redraw_reason = "scroll bar wasn't previously visible" - elif is_scroll_bar_visible and new_content_height <= height - 1: + elif is_scrollbar_visible and new_content_height <= height - 1: force_redraw_reason = "scroll bar shouldn't be visible" else: force_redraw = False diff --git a/nyx/util/tracker.py b/nyx/util/tracker.py index 88a53c3..237a01c 100644 --- a/nyx/util/tracker.py +++ b/nyx/util/tracker.py @@ -31,8 +31,7 @@ Background tasks for gathering information about the tor process. ConsensusTracker - performant lookups for consensus related information |- update - updates the consensus information we're based on |- get_relay_nickname - provides the nickname for a given relay - |- get_relay_fingerprint - provides the relay running at a location - |- get_all_relay_fingerprints - provides all relays running at a location + |- get_relay_fingerprints - provides relays running at a location +- get_relay_address - provides the address a relay is running at .. data:: Resources @@ -821,47 +820,25 @@ class ConsensusTracker(object): return self._nickname_cache.get(fingerprint) - def get_relay_fingerprint(self, address, port = None): + def get_relay_fingerprints(self, address): """ - Provides the relay running at a given location. If there's multiple relays - and no port is provided to disambiguate then this returns **None**. + Provides the relays running at a given location. :param str address: address to be checked - :param int port: optional ORPort to match against - :returns: **str** with the fingerprint of the relay running there + :returns: **dict** of ORPorts to their fingerprint """ controller = tor_controller() if address == controller.get_info('address', None): - if not port or port in controller.get_ports(stem.control.Listener.OR, []): - return controller.get_info('fingerprint', None) + fingerprint = controller.get_info('fingerprint', None) + ports = controller.get_ports(stem.control.Listener.OR, None) - matches = self._fingerprint_cache.get(address, []) + if fingerprint and ports: + return dict([(port, fingerprint) for port in ports]) - if len(matches) == 1: - match_port, match_fingerprint = matches[0] - return match_fingerprint if (not port or port == match_port) else None - elif len(matches) > 1 and port: - # there's multiple matches and we have a port to disambiguate with - - for match_port, match_fingerprint in matches: - if port == match_port: - return match_fingerprint - - return None - - def get_all_relay_fingerprints(self, address): - """ - Provides a [(port, fingerprint)...] tuple of all relays on a given address. - - :param str address: address to be checked - - :returns: **list** of port/fingerprint tuples running on it - """ - - return self._fingerprint_cache.get(address, []) + return dict([(port, fp) for (port, fp) in self._fingerprint_cache.get(address, [])]) def get_relay_address(self, fingerprint, default): """

1 0

[nyx/master] Use stem's parsing for descriptors
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 526247dc656c85125e4cbea129fdec1e826d8716 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 3 07:43:49 2015 -0700 Use stem's parsing for descriptors Our connection panel does manual parsing of descriptors for its details popup. No need to do that any longer. --- nyx/connections/conn_entry.py | 79 ++++++++--------------------------------- 1 file changed, 14 insertions(+), 65 deletions(-) diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index 37fb59c..1f2439d 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -385,75 +385,24 @@ class ConnectionLine(object): controller = tor_controller() if fingerprint: - # single match - display information available about it + lines[1] = '%-13sfingerprint: %s' % (lines[1], fingerprint) # append fingerprint to second line - ns_entry = controller.get_info('ns/id/%s' % fingerprint, None) - desc_entry = controller.get_info('desc/id/%s' % fingerprint, None) + router_status_entry = controller.get_network_status(fingerprint, None) + server_descriptor = controller.get_server_descriptor(fingerprint, None) - # append the fingerprint to the second line + if router_status_entry: + dir_port_label = 'dirport: %s' % router_status_entry.dir_port if router_status_entry.dir_port else '' + lines[2] = 'nickname: %-25s orport: %-10s %s' % (router_status_entry.nickname, router_status_entry.or_port, dir_port_label) + lines[3] = 'published: %s' % router_status_entry.published.strftime("%H:%M %m/%d/%Y") + lines[4] = 'flags: %s' % ', '.join(router_status_entry.flags) - lines[1] = '%-13sfingerprint: %s' % (lines[1], fingerprint) - - if ns_entry: - # example consensus entry: - # r murble R8sCM1ar1sS2GulQYFVmvN95xsk RJr6q+wkTFG+ng5v2bdCbVVFfA4 2011-02-21 00:25:32 195.43.157.85 443 0 - # s Exit Fast Guard Named Running Stable Valid - # w Bandwidth=2540 - # p accept 20-23,43,53,79-81,88,110,143,194,443 - - ns_lines = ns_entry.split('\n') - - first_line_comp = ns_lines[0].split(' ') - - if len(first_line_comp) >= 9: - _, nickname, _, _, published_date, published_time, _, or_port, dir_port = first_line_comp[:9] - else: - nickname, published_date, published_time, or_port, dir_port = '', '', '', '', '' - - flags = 'unknown' - - if len(ns_lines) >= 2 and ns_lines[1].startswith('s '): - flags = ns_lines[1][2:] - - descriptor = controller.get_server_descriptor(fingerprint, None) - exit_policy = descriptor.exit_policy if descriptor else None - policy_label = exit_policy.summary() if exit_policy else 'unknown' - - dir_port_label = '' if dir_port == '0' else 'dirport: %s' % dir_port - lines[2] = 'nickname: %-25s orport: %-10s %s' % (nickname, or_port, dir_port_label) - lines[3] = 'published: %s %s' % (published_time, published_date) - lines[4] = 'flags: %s' % flags.replace(' ', ', ') + if server_descriptor: + policy_label = server_descriptor.exit_policy.summary() if server_descriptor.exit_policy else 'unknown' lines[5] = 'exit policy: %s' % policy_label + lines[3] = '%-35s os: %-14s version: %s' % (lines[3], server_descriptor.operating_system, server_descriptor.tor_version) - if desc_entry: - tor_version, platform, contact = '', '', '' - - for desc_line in desc_entry.split('\n'): - if desc_line.startswith('platform'): - # has the tor version and platform, ex: - # platform Tor 0.2.1.29 (r318f470bc5f2ad43) on Linux x86_64 - - tor_version = desc_line[13:desc_line.find(' ', 13)] - platform = desc_line[desc_line.rfind(' on ') + 4:] - elif desc_line.startswith('contact'): - contact = desc_line[8:] - - # clears up some highly common obscuring - - for alias in (' at ', ' AT '): - contact = contact.replace(alias, '@') - - for alias in (' dot ', ' DOT '): - contact = contact.replace(alias, '.') - - break # contact lines come after the platform - - lines[3] = '%-35s os: %-14s version: %s' % (lines[3], platform, tor_version) - - # contact information is an optional field - - if contact: - lines[6] = 'contact: %s' % contact + if server_descriptor.contact: + lines[6] = 'contact: %s' % server_descriptor.contact else: all_matches = nyx.util.tracker.get_consensus_tracker().get_all_relay_fingerprints(self.connection.remote_address) @@ -465,7 +414,7 @@ class ConnectionLine(object): is_last_line = i == 3 relay_port, relay_fingerprint = all_matches[i] - line_text = '%i. or port: %-5s fingerprint: %s' % (i, relay_port, relay_fingerprint) + line_text = '%i. or port: %-5s fingerprint: %s' % (i + 1, relay_port, relay_fingerprint) # if there's multiple lines remaining at the end then give a count

1 0

[nyx/master] Move Category enum to panel
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 4eda274e7aeef2f40bea415238f23ca23e17bb0f Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 31 08:44:31 2015 -0700 Move Category enum to panel All submodules need this so lets localize it with the other enums in the module. We'll be consolidating into a single module eventually, but in the meantime this simplifies the imports. --- nyx/connections/circ_entry.py | 4 ++-- nyx/connections/conn_entry.py | 38 ++++++-------------------------------- nyx/connections/conn_panel.py | 41 +++++++++++++++++++++++++++++++++-------- nyx/connections/entries.py | 12 ++++++------ 4 files changed, 47 insertions(+), 48 deletions(-) diff --git a/nyx/connections/circ_entry.py b/nyx/connections/circ_entry.py index 3cf0147..cd42fc8 100644 --- a/nyx/connections/circ_entry.py +++ b/nyx/connections/circ_entry.py @@ -69,7 +69,7 @@ class CircHeaderLine(conn_entry.ConnectionLine): def get_details(self, width): if not self.is_built: - detail_format = (curses.A_BOLD, conn_entry.CATEGORY_COLOR[self._entry.get_type()]) + detail_format = (curses.A_BOLD, conn_panel.CATEGORY_COLOR[self._entry.get_type()]) return [('Building Circuit...', detail_format)] else: return conn_entry.ConnectionLine.get_details(self, width) @@ -127,7 +127,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 = nyx.util.ui_tools.get_color(conn_entry.CATEGORY_COLOR[self._entry.get_type()]) + line_format = nyx.util.ui_tools.get_color(conn_panel.CATEGORY_COLOR[self._entry.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 b2fe648..fa85bc6 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -9,32 +9,10 @@ import nyx.util.tracker import nyx.util.ui_tools from nyx.util import tor_controller -from nyx.connections import entries - -from stem.util import conf, connection, enum, str_tools - -# Connection Categories: -# Inbound Relay connection, coming to us. -# Outbound Relay connection, leaving us. -# Exit Outbound relay connection leaving the Tor network. -# Hidden Connections to a hidden service we're providing. -# Socks Socks connections for applications using Tor. -# Circuit Circuits our tor client has created. -# Directory Fetching tor consensus information. -# Control Tor controller (nyx, vidalia, etc). - -Category = enum.Enum('INBOUND', 'OUTBOUND', 'EXIT', 'HIDDEN', 'SOCKS', 'CIRCUIT', 'DIRECTORY', 'CONTROL') - -CATEGORY_COLOR = { - Category.INBOUND: 'green', - Category.OUTBOUND: 'blue', - Category.EXIT: 'red', - Category.HIDDEN: 'magenta', - Category.SOCKS: 'yellow', - Category.CIRCUIT: 'cyan', - Category.DIRECTORY: 'magenta', - Category.CONTROL: 'red', -} +from nyx.connections import conn_panel, entries +from nyx.connections.conn_panel import Category + +from stem.util import conf, connection, str_tools # static data for listing format # <src> --> <dst> <etc><padding> @@ -151,7 +129,7 @@ class ConnectionLine(entries.ConnectionPanelLine): # category - "<type>" # postType - ") " - line_format = nyx.util.ui_tools.get_color(CATEGORY_COLOR[entry_type]) + line_format = nyx.util.ui_tools.get_color(conn_panel.CATEGORY_COLOR[entry_type]) time_width = 6 if CONFIG['features.connection.markInitialConnections'] else 5 draw_entry = [(' ', line_format), @@ -172,7 +150,7 @@ class ConnectionLine(entries.ConnectionPanelLine): width - available space to display in """ - detail_format = (curses.A_BOLD, CATEGORY_COLOR[self._entry.get_type()]) + detail_format = (curses.A_BOLD, conn_panel.CATEGORY_COLOR[self._entry.get_type()]) return [(line, detail_format) for line in self._get_detail_content(width)] def get_etc_content(self, width, listing_type): @@ -184,8 +162,6 @@ class ConnectionLine(entries.ConnectionPanelLine): listing_type - primary attribute we're listing connections by """ - from nyx.connections import conn_panel - # for applications show the command/pid if self._entry.get_type() in (Category.SOCKS, Category.HIDDEN, Category.CONTROL): @@ -268,8 +244,6 @@ class ConnectionLine(entries.ConnectionPanelLine): listing_type - primary attribute we're listing connections by """ - from nyx.connections import conn_panel - controller = tor_controller() my_type = self._entry.get_type() destination_address = self.get_destination_label(26, include_locale = True) diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py index 2f6fde3..f2d613e 100644 --- a/nyx/connections/conn_panel.py +++ b/nyx/connections/conn_panel.py @@ -12,7 +12,7 @@ import threading import nyx.popups import nyx.util.tracker -from nyx.connections import descriptor_popup, entries, conn_entry +from nyx.connections import descriptor_popup, entries from nyx.util import panel, tor_controller, ui_tools from stem.control import State @@ -29,6 +29,29 @@ Listing = enum.Enum(('IP_ADDRESS', 'IP Address'), 'FINGERPRINT', 'NICKNAME') EXIT_USAGE_WIDTH = 15 UPDATE_RATE = 5 # rate in seconds at which we refresh +# Connection Categories: +# Inbound Relay connection, coming to us. +# Outbound Relay connection, leaving us. +# Exit Outbound relay connection leaving the Tor network. +# Hidden Connections to a hidden service we're providing. +# Socks Socks connections for applications using Tor. +# Circuit Circuits our tor client has created. +# Directory Fetching tor consensus information. +# Control Tor controller (nyx, vidalia, etc). + +Category = enum.Enum('INBOUND', 'OUTBOUND', 'EXIT', 'HIDDEN', 'SOCKS', 'CIRCUIT', 'DIRECTORY', 'CONTROL') + +CATEGORY_COLOR = { + Category.INBOUND: 'green', + Category.OUTBOUND: 'blue', + Category.EXIT: 'red', + Category.HIDDEN: 'magenta', + Category.SOCKS: 'yellow', + Category.CIRCUIT: 'cyan', + Category.DIRECTORY: 'magenta', + Category.CONTROL: 'red', +} + SortAttr = enum.Enum('CATEGORY', 'UPTIME', 'LISTING', 'IP_ADDRESS', 'PORT', 'FINGERPRINT', 'NICKNAME', 'COUNTRY') SORT_COLORS = { @@ -130,6 +153,8 @@ class ConnectionPanel(panel.Panel, threading.Thread): # mark the initially exitsing connection uptimes as being estimates + from nyx.connections import conn_entry + for entry in self._entries: if isinstance(entry, conn_entry.ConnectionEntry): entry.get_lines()[0].is_initial_connection = True @@ -199,7 +224,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): elif attr == SortAttr.NICKNAME: return connection_line.get_nickname('z' * 20) elif attr == SortAttr.CATEGORY: - return conn_entry.Category.index_of(entry.get_type()) + return Category.index_of(entry.get_type()) elif attr == SortAttr.UPTIME: return connection_line.connection.start_time elif attr == SortAttr.COUNTRY: @@ -316,7 +341,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): if not selection: break - color = conn_entry.CATEGORY_COLOR[selection.get_type()] + color = CATEGORY_COLOR[selection.get_type()] 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 = descriptor_popup.show_descriptor_popup(fingerprint, color, self.max_x, is_close_key) @@ -488,7 +513,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): title = 'Connections:' else: counts = collections.Counter([entry.get_type() for entry in entries]) - count_labels = ['%i %s' % (counts[category], category.lower()) for category in conn_entry.Category if counts[category]] + count_labels = ['%i %s' % (counts[category], category.lower()) for category in Category if counts[category]] title = 'Connections (%s):' % ', '.join(count_labels) self.addstr(0, 0, title, curses.A_STANDOUT) @@ -530,12 +555,12 @@ class ConnectionPanel(panel.Panel, threading.Thread): for entry in new_entries: entry_line = entry.get_lines()[0] - if entry.is_private() and entry.get_type() == conn_entry.Category.INBOUND: + if entry.is_private() and 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 - elif entry.get_type() == conn_entry.Category.EXIT: + 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 @@ -550,9 +575,9 @@ class ConnectionPanel(panel.Panel, threading.Thread): for entry in new_entries: line = entry.get_lines()[0] - if entry.get_type() in (conn_entry.Category.SOCKS, conn_entry.Category.CONTROL): + if entry.get_type() in (Category.SOCKS, Category.CONTROL): local_ports.append(line.connection.remote_port) - elif entry.get_type() == conn_entry.Category.HIDDEN: + elif entry.get_type() == Category.HIDDEN: remote_ports.append(line.connection.local_port) nyx.util.tracker.get_port_usage_tracker().query(local_ports, remote_ports) diff --git a/nyx/connections/entries.py b/nyx/connections/entries.py index 4c6fa9c..90de9d4 100644 --- a/nyx/connections/entries.py +++ b/nyx/connections/entries.py @@ -38,9 +38,9 @@ class Entry(object): @staticmethod def from_circuit(circ): import nyx.connections.circ_entry - import nyx.connections.conn_entry + from nyx.connections.conn_panel import Category - entry = Entry(nyx.connections.conn_entry.Category.CIRCUIT) + entry = Entry(Category.CIRCUIT) entry._lines = [nyx.connections.circ_entry.CircHeaderLine(entry, circ)] for fingerprint, _ in circ.path: @@ -67,19 +67,19 @@ class Entry(object): :returns: **bool** indicating if connection information is sensive or not """ - import nyx.connections.conn_entry + from nyx.connections.conn_panel import Category if not CONFIG['features.connection.showIps']: return True connection = self._lines[0].connection - if self.get_type() == nyx.connections.conn_entry.Category.INBOUND: + if self.get_type() == Category.INBOUND: controller = tor_controller() if controller.is_user_traffic_allowed().inbound: return len(nyx.util.tracker.get_consensus_tracker().get_all_relay_fingerprints(connection.remote_address)) == 0 - elif self.get_type() == nyx.connections.conn_entry.Category.EXIT: + elif self.get_type() == Category.EXIT: # DNS connections exiting us aren't private (since they're hitting our # resolvers). Everything else is. @@ -162,7 +162,7 @@ class ConnectionPanelLine: def get_type(connection): - from nyx.connections.conn_entry import Category + from nyx.connections.conn_panel import Category controller = tor_controller() if connection.local_port in controller.get_ports(Listener.OR, []):

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2015