tor-commits September 2015

tor-commits@lists.torproject.org

15 participants
1411 discussions

[nyx/master] Move get_locale() out of the Endpoint class
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit f67a50d10981ce2840d00c02cb62844290e2dcc1 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 25 19:45:55 2015 -0700 Move get_locale() out of the Endpoint class We only ever care about the remote endpoint, so might as well move this to the line class. One step closer to axing the Endpoint entirely. --- nyx/connections/conn_entry.py | 18 +++++++++--------- nyx/connections/conn_panel.py | 2 +- nyx/connections/entries.py | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index d0ff8dc..fd066e5 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -67,13 +67,6 @@ class Endpoint: self.fingerprint_overwrite = None - def get_locale(self, default = None): - """ - Provides the two letter country code of this relay. - """ - - return tor_controller().get_info('ip-to-country/%s' % self._address, default) - def get_fingerprint(self, default = None): """ Provides the fingerprint of this relay. @@ -184,6 +177,13 @@ class ConnectionLine(entries.ConnectionPanelLine): self.sort_address = ip_value self.sort_port = self.connection.remote_port + 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_listing_entry(self, width, current_time, listing_type): """ Provides the tuple list for this connection's listing. Lines are composed @@ -601,7 +601,7 @@ class ConnectionLine(entries.ConnectionPanelLine): lines = [''] * 7 lines[0] = 'address: %s' % self.get_destination_label(width - 11) - lines[1] = 'locale: %s' % ('??' if self.is_private() else self.foreign.get_locale('??')) + lines[1] = 'locale: %s' % ('??' if self.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 @@ -777,7 +777,7 @@ class ConnectionLine(entries.ConnectionPanelLine): controller = tor_controller() if include_locale and not controller.is_geoip_unavailable(): - foreign_locale = self.foreign.get_locale('??') + foreign_locale = self.get_locale('??') extra_info.append(foreign_locale) space_available -= len(foreign_locale) + 2 diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py index 193ec90..51f22a8 100644 --- a/nyx/connections/conn_panel.py +++ b/nyx/connections/conn_panel.py @@ -485,7 +485,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): entry_line = entry.get_lines()[0] if entry_line.is_private() and entry_line.get_type() == conn_entry.Category.INBOUND: - client_locale = entry_line.foreign.get_locale() + 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 diff --git a/nyx/connections/entries.py b/nyx/connections/entries.py index 06d3831..228b172 100644 --- a/nyx/connections/entries.py +++ b/nyx/connections/entries.py @@ -149,7 +149,7 @@ class ConnectionPanelEntry: if connection_line.connection.is_private_address(self.lines[0].connection.remote_address): return '' else: - return connection_line.foreign.get_locale('') + return connection_line.get_locale('') elif attr == SortAttr.LISTING: if listing_type == ListingType.IP_ADDRESS: # uses the IP address as the primary value, and port as secondary

1 0

[nyx/master] Drop internal reset_display() methods
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 8f473b63f31ba100edc11a40d8f5efcb3ebc4cd1 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 26 11:14:42 2015 -0700 Drop internal reset_display() methods Seems to be leftovers from our attempt to do in-place modifications. The ConnectionPanelEntry's method was completely unused, and the ConnectionPanelLine's invoked whenever we got lines but doesn't look to be important (flushes a few caches, which think we now want to keep). --- nyx/connections/conn_entry.py | 4 ---- nyx/connections/entries.py | 29 ----------------------------- 2 files changed, 33 deletions(-) diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index e9f9297..42466d9 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -243,10 +243,6 @@ class ConnectionLine(entries.ConnectionPanelLine): detail_format = (curses.A_BOLD, CATEGORY_COLOR[self.get_type()]) return [(line, detail_format) for line in self._get_detail_content(width)] - def reset_display(self): - entries.ConnectionPanelLine.reset_display(self) - self.cached_type = None - def is_private(self): """ Returns true if the endpoint is private, possibly belonging to a client diff --git a/nyx/connections/entries.py b/nyx/connections/entries.py index c4db1ea..fa4e71f 100644 --- a/nyx/connections/entries.py +++ b/nyx/connections/entries.py @@ -41,9 +41,7 @@ def to_unix_time(dt): class ConnectionPanelEntry: def __init__(self, start_time): self.lines = [] - self.flush_cache = True self.start_time = start_time - self.lines = [] @staticmethod def from_connection(conn): @@ -90,20 +88,8 @@ class ConnectionPanelEntry: Provides the individual lines in the connection listing. """ - if self.flush_cache: - self.lines = self._get_lines(self.lines) - self.flush_cache = False - return self.lines - def _get_lines(self, old_results): - # implementation of get_lines - - for line in old_results: - line.reset_display() - - return old_results - def get_sort_values(self, sort_attrs, listing_type): """ Provides the value used in comparisons to sort based on the given @@ -163,13 +149,6 @@ class ConnectionPanelEntry: else: return '' - def reset_display(self): - """ - Flushes cached display results. - """ - - self.flush_cache = True - class ConnectionPanelLine: """ @@ -235,11 +214,3 @@ class ConnectionPanelLine: def _get_details(self, width): # implementation of get_details return [] - - def reset_display(self): - """ - Flushes cached display results. - """ - - self._listing_cache_args = (None, None) - self._details_cache_args = None

1 0

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

22 Sep '15

commit 2f3fb3c4f1de830ec739a11adbae8a6cc5c309d8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 25 20:08:22 2015 -0700 Drop Endpoint class Only bits left were get_finterprint() and get_nickname(). Both were only relevant to remote addresses so just as well as a line method. This also lets us get rid of a couple hacky variables (overwrite and 'is ORPort'). --- nyx/connections/circ_entry.py | 20 +++++++--- nyx/connections/conn_entry.py | 85 ++++++++++++++--------------------------- nyx/connections/conn_panel.py | 2 +- nyx/connections/entries.py | 4 +- nyx/util/tracker.py | 2 +- 5 files changed, 48 insertions(+), 65 deletions(-) diff --git a/nyx/connections/circ_entry.py b/nyx/connections/circ_entry.py index c49dbc4..94a0196 100644 --- a/nyx/connections/circ_entry.py +++ b/nyx/connections/circ_entry.py @@ -30,11 +30,18 @@ class CircHeaderLine(conn_entry.ConnectionLine): self.purpose = circ.purpose.capitalize() self.is_built = False self._timestamp = entries.to_unix_time(circ.created) + self._remote_fingerprint = None def set_exit(self, exit_address, exit_port, exit_fingerprint): conn_entry.ConnectionLine.__init__(self, nyx.util.tracker.Connection(self._timestamp, False, '127.0.0.1', 0, exit_address, exit_port, 'tcp'), False, False) self.is_built = True - self.foreign.fingerprint_overwrite = exit_fingerprint + self._remote_fingerprint = exit_fingerprint + + def get_fingerprint(self, default = None): + if self._remote_fingerprint: + return self._remote_fingerprint + else: + return conn_entry.ConnectionLine.get_fingerprint(self, default) def get_type(self): return conn_entry.Category.CIRCUIT @@ -78,7 +85,7 @@ class CircLine(conn_entry.ConnectionLine): def __init__(self, remote_address, remote_port, remote_fingerprint, placement_label, timestamp): conn_entry.ConnectionLine.__init__(self, nyx.util.tracker.Connection(timestamp, False, '127.0.0.1', 0, remote_address, remote_port, 'tcp')) - self.foreign.fingerprint_overwrite = remote_fingerprint + self._remote_fingerprint = remote_fingerprint self.placement_label = placement_label self.include_port = False @@ -86,6 +93,9 @@ class CircLine(conn_entry.ConnectionLine): self.is_last = False + def get_fingerprint(self, default = None): + self._remote_fingerprint + def get_type(self): return conn_entry.Category.CIRCUIT @@ -132,21 +142,21 @@ class CircLine(conn_entry.ConnectionLine): # fills the nickname into the empty space here - dst = '%s%-25s ' % (dst[:25], str_tools.crop(self.foreign.get_nickname('UNKNOWN'), 25, 0)) + 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: # dst width is derived as: # src (9) + dst (40) + divider (7) + right gap (2) - bracket (3) = 55 char - dst = '%-55s' % self.foreign.get_fingerprint('UNKNOWN') + 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.foreign.get_nickname('UNKNOWN') + dst = dst_layout % self.get_nickname('UNKNOWN') return ((dst + etc, line_format), (' ' * (width - baseline_space - len(dst) - len(etc) + 5), line_format), diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index fd066e5..e9f9297 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -53,47 +53,6 @@ CONFIG = conf.config_dict('nyx', { }) -class Endpoint: - """ - Connection endpoint, with basic consensus information if a relay. - """ - - def __init__(self, address, port): - self._address = address - self._port = port - self.is_or_port = False # if set, consider the port to possibly be an ORPort - - # if set then this overwrites fingerprint lookups - - self.fingerprint_overwrite = None - - def get_fingerprint(self, default = None): - """ - Provides the fingerprint of this relay. - """ - - if self.fingerprint_overwrite: - return self.fingerprint_overwrite - - my_fingerprint = nyx.util.tracker.get_consensus_tracker().get_relay_fingerprint(self._address, self._port if self.is_or_port else None) - return my_fingerprint if my_fingerprint else default - - def get_nickname(self, default = None): - """ - Provides the nickname of this relay. - """ - - fingerprint = self.get_fingerprint() - - if fingerprint: - nickname = nyx.util.tracker.get_consensus_tracker().get_relay_nickname(fingerprint) - - if nickname: - return nickname - - return default - - class ConnectionLine(entries.ConnectionPanelLine): """ Display component of the ConnectionEntry. @@ -102,14 +61,11 @@ class ConnectionLine(entries.ConnectionPanelLine): def __init__(self, conn, include_port=True, include_expanded_addresses=True): entries.ConnectionPanelLine.__init__(self) - self.local = Endpoint(conn.local_address, int(conn.local_port)) - self.foreign = Endpoint(conn.remote_address, int(conn.remote_port)) self.connection = conn # overwrite the local fingerprint with ours controller = tor_controller() - self.local.fingerprint_overwrite = controller.get_info('fingerprint', None) # True if the connection has matched the properties of a client/directory # connection every time we've checked. The criteria we check is... @@ -147,7 +103,6 @@ class ConnectionLine(entries.ConnectionPanelLine): if conn.local_port in (my_or_port, my_dir_port): self.base_type = Category.INBOUND - self.local.is_or_port = True elif conn.local_port == my_socks_port: self.base_type = Category.SOCKS elif conn.remote_port in my_hidden_service_ports: @@ -156,7 +111,6 @@ class ConnectionLine(entries.ConnectionPanelLine): self.base_type = Category.CONTROL else: self.base_type = Category.OUTBOUND - self.foreign.is_or_port = True self.cached_type = None @@ -184,6 +138,25 @@ class ConnectionLine(entries.ConnectionPanelLine): 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.base_type == Category.OUTBOUND: + my_fingerprint = nyx.util.tracker.get_consensus_tracker().get_relay_fingerprint(self.connection.remote_address, 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 + def get_listing_entry(self, width, current_time, listing_type): """ Provides the tuple list for this connection's listing. Lines are composed @@ -331,7 +304,7 @@ class ConnectionLine(entries.ConnectionPanelLine): # tor_tools util keeping this a quick lookup. controller = tor_controller() - destination_fingerprint = self.foreign.get_fingerprint() + destination_fingerprint = self.get_fingerprint() if not destination_fingerprint: # Not a known relay. This might be an exit connection. @@ -416,14 +389,14 @@ class ConnectionLine(entries.ConnectionPanelLine): if width > used_space + 42 and CONFIG['features.connection.showColumn.fingerprint']: # show fingerprint (column width: 42 characters) - etc += '%-40s ' % self.foreign.get_fingerprint('UNKNOWN') + etc += '%-40s ' % self.get_fingerprint('UNKNOWN') used_space += 42 if width > used_space + 10 and CONFIG['features.connection.showColumn.nickname']: # show nickname (column width: remainder) nickname_space = width - used_space - nickname_label = str_tools.crop(self.foreign.get_nickname('UNKNOWN'), nickname_space, 0) + 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: @@ -442,7 +415,7 @@ class ConnectionLine(entries.ConnectionPanelLine): nickname_space -= 28 if CONFIG['features.connection.showColumn.nickname']: - nickname_label = str_tools.crop(self.foreign.get_nickname('UNKNOWN'), nickname_space, 0) + nickname_label = str_tools.crop(self.get_nickname('UNKNOWN'), nickname_space, 0) etc += ('%%-%is ' % nickname_space) % nickname_label used_space += nickname_space + 2 @@ -452,7 +425,7 @@ class ConnectionLine(entries.ConnectionPanelLine): else: if width > used_space + 42 and CONFIG['features.connection.showColumn.fingerprint']: # show fingerprint (column width: 42 characters) - etc += '%-40s ' % self.foreign.get_fingerprint('UNKNOWN') + etc += '%-40s ' % self.get_fingerprint('UNKNOWN') used_space += 42 if width > used_space + 28 and CONFIG['features.connection.showColumn.destination']: @@ -551,7 +524,7 @@ class ConnectionLine(entries.ConnectionPanelLine): if my_type == Category.CONTROL: dst = 'localhost' else: - dst = self.foreign.get_fingerprint('UNKNOWN') + dst = self.get_fingerprint('UNKNOWN') dst = '%-40s' % dst @@ -561,12 +534,12 @@ class ConnectionLine(entries.ConnectionPanelLine): used_space += len(etc) else: # base data requires 50 min characters - src = self.local.get_nickname('UNKNOWN') + src = controller.get_conf('nickname', 'UNKNOWN') if my_type == Category.CONTROL: - dst = self.local.get_nickname('UNKNOWN') + dst = controller.get_conf('nickname', 'UNKNOWN') else: - dst = self.foreign.get_nickname('UNKNOWN') + dst = self.get_nickname('UNKNOWN') min_base_space = 50 @@ -610,7 +583,7 @@ class ConnectionLine(entries.ConnectionPanelLine): # - if no consensus data is available then say so (probably a client or # exit connection) - fingerprint = self.foreign.get_fingerprint() + fingerprint = self.get_fingerprint() controller = tor_controller() if fingerprint: diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py index 51f22a8..b977e7d 100644 --- a/nyx/connections/conn_panel.py +++ b/nyx/connections/conn_panel.py @@ -272,7 +272,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): break color = nyx.connections.conn_entry.CATEGORY_COLOR[selection.get_type()] - fingerprint = selection.foreign.get_fingerprint() + 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 228b172..c4db1ea 100644 --- a/nyx/connections/entries.py +++ b/nyx/connections/entries.py @@ -132,9 +132,9 @@ class ConnectionPanelEntry: elif attr == SortAttr.PORT: return connection_line.sort_port elif attr == SortAttr.FINGERPRINT: - return connection_line.foreign.get_fingerprint('UNKNOWN') + return connection_line.get_fingerprint('UNKNOWN') elif attr == SortAttr.NICKNAME: - my_nickname = connection_line.foreign.get_nickname() + my_nickname = connection_line.get_nickname() if my_nickname: return my_nickname.lower() diff --git a/nyx/util/tracker.py b/nyx/util/tracker.py index 2471aff..b122d4b 100644 --- a/nyx/util/tracker.py +++ b/nyx/util/tracker.py @@ -748,7 +748,7 @@ class ConsensusTracker(object): controller = tor_controller() - if fingerprint not in self._nickname_cache: + if fingerprint and fingerprint not in self._nickname_cache: if fingerprint == controller.get_info('fingerprint', None): self._nickname_cache[fingerprint] = controller.get_conf('Nickname', 'Unnamed') else:

1 0

[nyx/master] Properly use application resolution in the panel
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 6846e119190e1de29d70ba25fb4db8d40c2b4b95 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jul 27 10:03:48 2015 -0700 Properly use application resolution in the panel Our connection panel still expected a tuple, causing a stacktrace. Fixing that, along with a couple issues with the tracker itself finally using this in a live instance hilighted: * system.call() raised an OSError rather than the exptected IOError * we were still calling lsof for zero ports, triggering failures --- nyx/connections/conn_panel.py | 13 ++++--------- nyx/util/tracker.py | 10 +++++++--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py index b977e7d..e40a431 100644 --- a/nyx/connections/conn_panel.py +++ b/nyx/connections/conn_panel.py @@ -540,15 +540,10 @@ class ConnectionPanel(panel.Panel, threading.Thread): line_port = line.connection.local_port if is_local else line.connection.remote_port if line_port in app_results: - # sets application attributes if there's a result with this as the - # inbound port + result = app_results[line_port] - for inbound_port, outbound_port, cmd, pid in app_results[line_port]: - app_port = outbound_port if is_local else inbound_port - - if line_port == app_port: - line.application_name = cmd - line.application_pid = pid - line.is_application_resolving = False + line.application_name = result.name + line.application_pid = result.pid + line.is_application_resolving = False else: line.is_application_resolving = self._app_resolver.is_alive diff --git a/nyx/util/tracker.py b/nyx/util/tracker.py index ebb3b84..f6219ad 100644 --- a/nyx/util/tracker.py +++ b/nyx/util/tracker.py @@ -299,8 +299,11 @@ def _process_for_ports(local_ports, remote_ports): # python 2462 atagar 3u IPv4 14047 0t0 TCP localhost:37277->localhost:9051 (ESTABLISHED) # python 3444 atagar 3u IPv4 22023 0t0 TCP localhost:51849->localhost:9051 (ESTABLISHED) - lsof_cmd = 'lsof -nP ' + ' '.join(['-i tcp:%s' % port for port in (local_ports + remote_ports)]) - lsof_call = system.call(lsof_cmd) + try: + lsof_cmd = 'lsof -nP ' + ' '.join(['-i tcp:%s' % port for port in (local_ports + remote_ports)]) + lsof_call = system.call(lsof_cmd) + except OSError as exc: + raise IOError(exc) if lsof_call: results = {} @@ -698,7 +701,8 @@ class PortUsageTracker(Daemon): ports.remove(port) try: - result.update(_process_for_ports(ports, ports)) + if ports: + result.update(_process_for_ports(ports, ports)) self._processes_for_ports = result self._failure_count = 0

1 0

[nyx/master] Differentiate between unknown and resolving apps
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit aba3b74ea029d5732af34192c55df101cf465fbf Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 30 08:56:09 2015 -0700 Differentiate between unknown and resolving apps Be a bit smarter about showing 'resolving...' when an application can't be determined and 'UNKNOWN' if it can't be determined. --- nyx/connections/conn_entry.py | 26 +++++++------------------ nyx/connections/conn_panel.py | 10 +++++----- nyx/util/tracker.py | 32 ++++++++++++++++++++++++++++--- test/util/tracker/port_usage_tracker.py | 6 +++--- 4 files changed, 44 insertions(+), 30 deletions(-) diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index fe18485..1eae80f 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -145,16 +145,6 @@ class ConnectionLine(entries.ConnectionPanelLine): nickname = nyx.util.tracker.get_consensus_tracker().get_relay_nickname(self.get_fingerprint()) return nickname if nickname else default - def get_process(self): - """ - Local process using this connection. This is only available for socks, - hidden service, and controller connections. This is **None** if the - application is either still being resolved or can't be determined. - """ - - port = self.connection.local_port if self.get_type() == Category.HIDDEN else self.connection.remote_port - return nyx.util.tracker.get_port_usage_tracker().fetch(port) - def get_listing_entry(self, width, current_time, listing_type): """ Provides the tuple list for this connection's listing. Lines are composed @@ -350,17 +340,15 @@ class ConnectionLine(entries.ConnectionPanelLine): # for applications show the command/pid if self.get_type() in (Category.SOCKS, Category.HIDDEN, Category.CONTROL): - display_label = '' - process = self.get_process() + port = self.connection.local_port if self.get_type() == Category.HIDDEN else self.connection.remote_port - if process: - if process.pid: - display_label = '%s (%s)' % (process.name, process.pid) - else: - display_label = process.name - else: - # TODO: We should differentiate between 'resolving...' and 'unknown' + 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 diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py index b8f97ad..629a559 100644 --- a/nyx/connections/conn_panel.py +++ b/nyx/connections/conn_panel.py @@ -495,12 +495,12 @@ class ConnectionPanel(panel.Panel, threading.Thread): self._last_resource_fetch = current_resolution_count if CONFIG['features.connection.resolveApps']: - local_ports, remote_ports = [] + local_ports, remote_ports = [], [] for line in self._entry_lines: - if line.get_type() == conn_entry.Category.HIDDEN: - local_ports.append(line.connection.local_port) - elif line.get_type() in (conn_entry.Category.SOCKS, conn_entry.Category.CONTROL): - remote_ports.append(line.connection.remote_port) + if line.get_type() in (conn_entry.Category.SOCKS, conn_entry.Category.CONTROL): + local_ports.append(line.connection.remote_port) + elif line.get_type() == conn_entry.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/util/tracker.py b/nyx/util/tracker.py index 57562f5..88a53c3 100644 --- a/nyx/util/tracker.py +++ b/nyx/util/tracker.py @@ -91,6 +91,14 @@ Process = collections.namedtuple('Process', [ ]) +class UnresolvedResult(Exception): + 'Indicates the application being used by a port is still being determined.' + + +class UnknownApplication(Exception): + 'No application could be determined for this port.' + + def get_connection_tracker(): """ Singleton for tracking the connections established by tor. @@ -253,7 +261,8 @@ def _process_for_ports(local_ports, remote_ports): :param list local_ports: local port numbers to look up :param list remote_ports: remote port numbers to look up - :returns: **dict** mapping the ports to the associated **Process** + :returns: **dict** mapping the ports to the associated **Process**, or + **None** if it can't be determined :raises: **IOError** if unsuccessful """ @@ -322,6 +331,9 @@ def _process_for_ports(local_ports, remote_ports): except ValueError as exc: raise IOError('unrecognized output from lsof (%s): %s' % (exc, line)) + for unknown_port in set(local_ports).union(remote_ports).difference(results.keys()): + results[unknown_port] = None + return results raise IOError('no results from lsof') @@ -679,10 +691,24 @@ class PortUsageTracker(Daemon): :param int port: port number to look up - :returns: **Process** using the given port, or **None** if it's unavailable + :returns: **Process** using the given port + + :raises: + * :class:`nyx.util.tracker.UnresolvedResult` if the application is still + being determined + * :class:`nyx.util.tracker.UnknownApplication` if the we tried to resolve + the application but it couldn't be determined """ - return self._processes_for_ports.get(port) + try: + result = self._processes_for_ports[port] + + if result is None: + raise UnknownApplication() + else: + return result + except KeyError: + raise UnresolvedResult() def query(self, local_ports, remote_ports): """ diff --git a/test/util/tracker/port_usage_tracker.py b/test/util/tracker/port_usage_tracker.py index 64c4c09..31bdd4c 100644 --- a/test/util/tracker/port_usage_tracker.py +++ b/test/util/tracker/port_usage_tracker.py @@ -47,8 +47,8 @@ class TestPortUsageTracker(unittest.TestCase): @patch('nyx.util.tracker.system.call', Mock(return_value = LSOF_OUTPUT.split('\n'))) def test_process_for_ports(self): self.assertEqual({}, _process_for_ports([], [])) - self.assertEqual({}, _process_for_ports([80, 443], [])) - self.assertEqual({}, _process_for_ports([], [80, 443])) + self.assertEqual({80: None, 443: None}, _process_for_ports([80, 443], [])) + self.assertEqual({80: None, 443: None}, _process_for_ports([], [80, 443])) self.assertEqual({37277: Process(2462, 'python'), 51849: Process(2001, 'tor')}, _process_for_ports([37277], [51849])) @@ -63,7 +63,7 @@ class TestPortUsageTracker(unittest.TestCase): for test_input in test_inputs: call_mock.return_value = test_input.split('\n') - self.assertEqual({}, _process_for_ports([80], [443])) + self.assertEqual({80: None, 443: None}, _process_for_ports([80], [443])) # Isuses that are reported as errors.

1 0

[nyx/master] Differentiate between app resolution by local/remote ports
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit bca09d443ff450113f7d46a0da204e500ef26f4e Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 30 08:10:07 2015 -0700 Differentiate between app resolution by local/remote ports Our helper for resolving applications by their port lets us differentiate between the local and remote port. When using it we said ports were both, but the connection lines know the difference. Plumbing it through to get more accurate results. --- nyx/connections/conn_panel.py | 24 ++++++++---------------- nyx/util/tracker.py | 27 +++++++++++++++++---------- test/util/tracker/port_usage_tracker.py | 6 +++--- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py index 5163ec9..b8f97ad 100644 --- a/nyx/connections/conn_panel.py +++ b/nyx/connections/conn_panel.py @@ -494,21 +494,13 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.set_sort_order() self._last_resource_fetch = current_resolution_count - self._resolve_apps() + if CONFIG['features.connection.resolveApps']: + local_ports, remote_ports = [] - def _resolve_apps(self): - """ - Triggers an asynchronous query for all unresolved SOCKS, HIDDEN, and - CONTROL entries. - """ - - if not CONFIG['features.connection.resolveApps']: - return - - app_ports = [] - - for line in self._entry_lines: - if line.get_type() in (conn_entry.Category.SOCKS, conn_entry.Category.HIDDEN, conn_entry.Category.CONTROL): - app_ports.append(line.connection.local_port if line.get_type() == conn_entry.Category.HIDDEN else line.connection.remote_port) + for line in self._entry_lines: + if line.get_type() == conn_entry.Category.HIDDEN: + local_ports.append(line.connection.local_port) + elif line.get_type() in (conn_entry.Category.SOCKS, conn_entry.Category.CONTROL): + remote_ports.append(line.connection.remote_port) - nyx.util.tracker.get_port_usage_tracker().query(app_ports) + nyx.util.tracker.get_port_usage_tracker().query(local_ports, remote_ports) diff --git a/nyx/util/tracker.py b/nyx/util/tracker.py index 5d9c81e..57562f5 100644 --- a/nyx/util/tracker.py +++ b/nyx/util/tracker.py @@ -666,7 +666,8 @@ class PortUsageTracker(Daemon): def __init__(self, rate): super(PortUsageTracker, self).__init__(rate) - self._last_requested_ports = [] + self._last_requested_local_ports = [] + self._last_requested_remote_ports = [] self._processes_for_ports = {} self._failure_count = 0 # number of times in a row we've failed to get results @@ -683,25 +684,28 @@ class PortUsageTracker(Daemon): return self._processes_for_ports.get(port) - def query(self, ports): + def query(self, local_ports, remote_ports): """ Registers a given set of ports for further lookups, and returns the last set of 'port => process' mappings we retrieved. Note that this means that we will not return the requested ports unless they're requested again after a successful lookup has been performed. - :param list ports: port numbers to look up + :param list local_ports: local port numbers to look up + :param list remote_ports: remote port numbers to look up :returns: **dict** mapping port numbers to the **Process** using it """ - self._last_requested_ports = ports + self._last_requested_local_ports = local_ports + self._last_requested_remote_ports = remote_ports return self._processes_for_ports def _task(self, process_pid, process_name): - ports = self._last_requested_ports + local_ports = self._last_requested_local_ports + remote_ports = self._last_requested_remote_ports - if not ports: + if not local_ports and not remote_ports: return True result = {} @@ -709,13 +713,16 @@ class PortUsageTracker(Daemon): # Use cached results from our last lookup if available. for port, process in self._processes_for_ports.items(): - if port in ports: + if port in local_ports: result[port] = process - ports.remove(port) + local_ports.remove(port) + elif port in remote_ports: + result[port] = process + remote_ports.remove(port) try: - if ports: - result.update(_process_for_ports(ports, ports)) + if local_ports or remote_ports: + result.update(_process_for_ports(local_ports, remote_ports)) self._processes_for_ports = result self._failure_count = 0 diff --git a/test/util/tracker/port_usage_tracker.py b/test/util/tracker/port_usage_tracker.py index 41d88d0..64c4c09 100644 --- a/test/util/tracker/port_usage_tracker.py +++ b/test/util/tracker/port_usage_tracker.py @@ -91,10 +91,10 @@ class TestPortUsageTracker(unittest.TestCase): with PortUsageTracker(0.02) as daemon: time.sleep(0.01) - self.assertEqual({}, daemon.query([37277, 51849])) + self.assertEqual({}, daemon.query([37277, 51849], [])) time.sleep(0.04) - self.assertEqual({37277: 'python', 51849: 'tor'}, daemon.query([37277, 51849])) + self.assertEqual({37277: 'python', 51849: 'tor'}, daemon.query([37277, 51849], [])) @patch('nyx.util.tracker.tor_controller') @patch('nyx.util.tracker._process_for_ports') @@ -110,7 +110,7 @@ class TestPortUsageTracker(unittest.TestCase): time.sleep(0.05) self.assertEqual(0, daemon._failure_count) - daemon.query([37277, 51849]) + daemon.query([37277, 51849], []) time.sleep(0.03) self.assertTrue(daemon.is_alive()) time.sleep(0.1)

1 0

[nyx/master] Helper for converting addresses to ints
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 000a39d09149955ce528dc60a9686546da0ca340 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 1 17:10:52 2015 -0700 Helper for converting addresses to ints We need an integer representation of ipv4 addresses for sorting. Our entity did this, but it's better to simply have a helper (simpler, and more cache hits). Might be moved again later. --- nyx/connections/conn_entry.py | 11 ----------- nyx/connections/entries.py | 18 ++++++++++++++++-- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index 381afec..021accb 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -70,17 +70,6 @@ class ConnectionLine(entries.ConnectionPanelLine): self.include_port = include_port self.include_expanded_addresses = include_expanded_addresses - # cached immutable values used for sorting - - ip_value = 0 - - for comp in self.connection.remote_address.split('.'): - ip_value *= 255 - ip_value += int(comp) - - self.sort_address = ip_value - self.sort_port = self.connection.remote_port - def get_locale(self, default = None): """ Provides the two letter country code for the remote endpoint. diff --git a/nyx/connections/entries.py b/nyx/connections/entries.py index 7ea3321..6963123 100644 --- a/nyx/connections/entries.py +++ b/nyx/connections/entries.py @@ -35,12 +35,26 @@ PORT_COUNT = 65536 # sort value for scrubbed ip addresses SCRUBBED_IP_VAL = 255 ** 4 +ADDRESS_CACHE = {} def to_unix_time(dt): return (dt - datetime.datetime(1970, 1, 1)).total_seconds() +def address_to_int(address): + if address not in ADDRESS_CACHE: + ip_value = 0 + + for comp in address.split('.'): + ip_value *= 255 + ip_value += int(comp) + + ADDRESS_CACHE[address] = ip_value + + return ADDRESS_CACHE[address] + + class ConnectionPanelEntry: def __init__(self, connection_type, start_time): self.lines = [] @@ -127,9 +141,9 @@ class ConnectionPanelEntry: if connection_line.is_private(): return SCRUBBED_IP_VAL # orders at the end - return connection_line.sort_address + return address_to_int(connection_line.connection.remote_address) elif attr == SortAttr.PORT: - return connection_line.sort_port + return connection_line.connection.remote_port elif attr == SortAttr.FINGERPRINT: return connection_line.get_fingerprint('UNKNOWN') elif attr == SortAttr.NICKNAME:

1 0

[nyx/master] Move connection type to be tracked by entity
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 6f7eac497a9d4062ff18d6a0b12791099e977f2c Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 1 16:51:27 2015 -0700 Move connection type to be tracked by entity Our get_type() method is a method on individual lines rather than the parent entity, which is weird. All lines always share the same type, and we almost always fetch it from entites via... my_entity.get_lines()[0].get_type() Moving it to be tracked on the entity instead, and lines just report whatever its parent has. --- nyx/connections/circ_entry.py | 16 +++----- nyx/connections/conn_entry.py | 81 ++--------------------------------------- nyx/connections/conn_panel.py | 10 ++--- nyx/connections/entries.py | 73 ++++++++++++++++++++++++++++++++----- 4 files changed, 77 insertions(+), 103 deletions(-) diff --git a/nyx/connections/circ_entry.py b/nyx/connections/circ_entry.py index 94a0196..7d3fc8d 100644 --- a/nyx/connections/circ_entry.py +++ b/nyx/connections/circ_entry.py @@ -24,8 +24,8 @@ class CircHeaderLine(conn_entry.ConnectionLine): lines except that its etc field has circuit attributes. """ - def __init__(self, circ): - conn_entry.ConnectionLine.__init__(self, nyx.util.tracker.Connection(entries.to_unix_time(circ.created), False, '127.0.0.1', 0, '0.0.0.0', 0, 'tcp'), False, False) + def __init__(self, entry, circ): + conn_entry.ConnectionLine.__init__(self, entry, nyx.util.tracker.Connection(entries.to_unix_time(circ.created), False, '127.0.0.1', 0, '0.0.0.0', 0, 'tcp'), False, False) self.circuit_id = circ.id self.purpose = circ.purpose.capitalize() self.is_built = False @@ -33,7 +33,7 @@ class CircHeaderLine(conn_entry.ConnectionLine): self._remote_fingerprint = None def set_exit(self, exit_address, exit_port, exit_fingerprint): - conn_entry.ConnectionLine.__init__(self, nyx.util.tracker.Connection(self._timestamp, False, '127.0.0.1', 0, exit_address, exit_port, 'tcp'), False, False) + conn_entry.ConnectionLine.__init__(self, self._entry, nyx.util.tracker.Connection(self._timestamp, False, '127.0.0.1', 0, exit_address, exit_port, 'tcp'), False, False) self.is_built = True self._remote_fingerprint = exit_fingerprint @@ -43,9 +43,6 @@ class CircHeaderLine(conn_entry.ConnectionLine): else: return conn_entry.ConnectionLine.get_fingerprint(self, default) - def get_type(self): - return conn_entry.Category.CIRCUIT - def get_destination_label(self, max_length, include_locale = False): if not self.is_built: return 'Building...' @@ -83,8 +80,8 @@ class CircLine(conn_entry.ConnectionLine): caching, etc). """ - def __init__(self, remote_address, remote_port, remote_fingerprint, placement_label, timestamp): - conn_entry.ConnectionLine.__init__(self, nyx.util.tracker.Connection(timestamp, False, '127.0.0.1', 0, remote_address, remote_port, 'tcp')) + def __init__(self, entry, remote_address, remote_port, remote_fingerprint, placement_label, timestamp): + conn_entry.ConnectionLine.__init__(self, entry, nyx.util.tracker.Connection(timestamp, False, '127.0.0.1', 0, remote_address, remote_port, 'tcp')) self._remote_fingerprint = remote_fingerprint self.placement_label = placement_label self.include_port = False @@ -96,9 +93,6 @@ class CircLine(conn_entry.ConnectionLine): def get_fingerprint(self, default = None): self._remote_fingerprint - def get_type(self): - return conn_entry.Category.CIRCUIT - def get_listing_prefix(self): if self.is_last: return (ord(' '), curses.ACS_LLCORNER, curses.ACS_HLINE, ord(' ')) diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index f8593ff..381afec 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -11,7 +11,6 @@ import nyx.util.ui_tools from nyx.util import tor_controller from nyx.connections import entries -from stem.control import Listener from stem.util import conf, connection, enum, str_tools # Connection Categories: @@ -59,13 +58,12 @@ class ConnectionLine(entries.ConnectionPanelLine): Display component of the ConnectionEntry. """ - def __init__(self, conn, include_port=True, include_expanded_addresses=True): + def __init__(self, entry, conn, include_port=True, include_expanded_addresses=True): entries.ConnectionPanelLine.__init__(self) + self._entry = entry self.connection = conn - self.cached_type = None - # includes the port or expanded ip address field when displaying listing # information if true @@ -225,80 +223,7 @@ class ConnectionLine(entries.ConnectionPanelLine): return False def get_type(self): - """ - Provides our best guess at the current type of the connection. This - depends on consensus results, our current client circuits, etc. Results - are cached until this entry's display is reset. - """ - - # caches both to simplify the calls and to keep the type consistent until - # we want to reflect changes - - if not self.cached_type: - 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 self.connection.local_port in controller.get_ports(Listener.OR, []): - base_type = Category.INBOUND - elif self.connection.local_port in controller.get_ports(Listener.DIR, []): - base_type = Category.INBOUND - elif self.connection.local_port in controller.get_ports(Listener.SOCKS, []): - base_type = Category.SOCKS - elif self.connection.remote_port in my_hidden_service_ports: - base_type = Category.HIDDEN - elif self.connection.local_port in controller.get_ports(Listener.CONTROL, []): - base_type = Category.CONTROL - else: - # Currently the only non-static categories are OUTBOUND vs... - # - EXIT since this depends on the current consensus - # - CIRCUIT if this is likely to belong to our guard usage - # - DIRECTORY if this is a single-hop circuit (directory mirror?) - # - # The exitability, circuits, and fingerprints are all cached by the - # tor_tools util keeping this a quick lookup. - - base_type = Category.OUTBOUND - destination_fingerprint = nyx.util.tracker.get_consensus_tracker().get_relay_fingerprint(self.connection.remote_address, self.connection.remote_port) - - if not destination_fingerprint: - # Not a known relay. This might be an exit connection. - - exit_policy = controller.get_exit_policy(None) - port = self.connection.remote_port if self.connection.remote_port else None - - if exit_policy and exit_policy.can_exit_to(self.connection.remote_address, port): - self.cached_type = Category.EXIT - else: - # This belongs to a known relay. If we haven't eliminated ourselves as - # a possible client or directory connection then check if it still - # holds true. - - my_circuits = controller.get_circuits([]) - - # Checks that this belongs to the first hop in a circuit that's - # either unestablished or longer than a single hop (ie, anything but - # a built 1-hop connection since those are most likely a directory - # mirror). - - for circ in my_circuits: - if circ.path and circ.path[0][0] == destination_fingerprint and (circ.status != 'BUILT' or len(circ.path) > 1): - self.cached_type = Category.CIRCUIT # matched a probable guard connection - - if not self.cached_type: - # Checks if we match a built, single hop circuit. - - for circ in my_circuits: - if circ.path and circ.path[0][0] == destination_fingerprint and circ.status == 'BUILT' and len(circ.path) == 1: - self.cached_type = Category.DIRECTORY - - if not self.cached_type: - self.cached_type = base_type - - return self.cached_type + return self._entry.get_type() def get_etc_content(self, width, listing_type): """ diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py index c16f874..7d06abe 100644 --- a/nyx/connections/conn_panel.py +++ b/nyx/connections/conn_panel.py @@ -438,7 +438,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): elif not entries: title = 'Connections:' else: - counts = collections.Counter([entry.get_lines()[0].get_type() for entry in entries]) + 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]] title = 'Connections (%s):' % ', '.join(count_labels) @@ -481,12 +481,12 @@ class ConnectionPanel(panel.Panel, threading.Thread): for entry in new_entries: entry_line = entry.get_lines()[0] - if entry_line.is_private() and entry_line.get_type() == conn_entry.Category.INBOUND: + if entry_line.is_private() and entry.get_type() == conn_entry.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_line.get_type() == conn_entry.Category.EXIT: + elif entry.get_type() == conn_entry.Category.EXIT: exit_port = entry_line.connection.remote_port self._exit_port_usage[exit_port] = self._exit_port_usage.get(exit_port, 0) + 1 @@ -501,9 +501,9 @@ class ConnectionPanel(panel.Panel, threading.Thread): for entry in new_entries: line = entry.get_lines()[0] - if line.get_type() in (conn_entry.Category.SOCKS, conn_entry.Category.CONTROL): + if entry.get_type() in (conn_entry.Category.SOCKS, conn_entry.Category.CONTROL): local_ports.append(line.connection.remote_port) - elif line.get_type() == conn_entry.Category.HIDDEN: + elif entry.get_type() == conn_entry.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 fa4e71f..7ea3321 100644 --- a/nyx/connections/entries.py +++ b/nyx/connections/entries.py @@ -6,6 +6,9 @@ consists of in the listing. import datetime +from nyx.util import tor_controller + +from stem.control import Listener from stem.util import enum # attributes we can list entries by @@ -39,25 +42,27 @@ def to_unix_time(dt): class ConnectionPanelEntry: - def __init__(self, start_time): + def __init__(self, connection_type, start_time): self.lines = [] - self.start_time = start_time + self._connection_type = connection_type + self._start_time = start_time @staticmethod def from_connection(conn): import nyx.connections.conn_entry - entry = ConnectionPanelEntry(conn.start_time) - entry.lines = [nyx.connections.conn_entry.ConnectionLine(conn)] + entry = ConnectionPanelEntry(get_type(conn), conn.start_time) + entry.lines = [nyx.connections.conn_entry.ConnectionLine(entry, conn)] return entry @staticmethod def from_circuit(circ): import nyx.connections.circ_entry + import nyx.connections.conn_entry import nyx.util.tracker - entry = ConnectionPanelEntry(to_unix_time(circ.created)) - entry.lines = [nyx.connections.circ_entry.CircHeaderLine(circ)] + entry = ConnectionPanelEntry(nyx.connections.conn_entry.Category.CIRCUIT, to_unix_time(circ.created)) + entry.lines = [nyx.connections.circ_entry.CircHeaderLine(entry, circ)] path = [path_entry[0] for path_entry in circ.path] @@ -77,12 +82,20 @@ class ConnectionPanelEntry: placement_label = '%i / %s' % (i + 1, placement_type) - entry.lines.append(nyx.connections.circ_entry.CircLine(relay_ip, relay_port, relay_fingerprint, placement_label, to_unix_time(circ.created))) + entry.lines.append(nyx.connections.circ_entry.CircLine(entry, relay_ip, relay_port, relay_fingerprint, placement_label, to_unix_time(circ.created))) entry.lines[-1].is_last = True return entry + def get_type(self): + """ + Provides our best guess at the current type of the connection. This + depends on consensus results, our current client circuits, etc. + """ + + return self._connection_type + def get_lines(self): """ Provides the individual lines in the connection listing. @@ -128,9 +141,9 @@ class ConnectionPanelEntry: return 'z' * 20 # orders at the end elif attr == SortAttr.CATEGORY: import nyx.connections.conn_entry - return nyx.connections.conn_entry.Category.index_of(connection_line.get_type()) + return nyx.connections.conn_entry.Category.index_of(self.get_type()) elif attr == SortAttr.UPTIME: - return self.start_time + return self._start_time elif attr == SortAttr.COUNTRY: if connection_line.connection.is_private_address(self.lines[0].connection.remote_address): return '' @@ -214,3 +227,45 @@ class ConnectionPanelLine: def _get_details(self, width): # implementation of get_details return [] + + +def get_type(connection): + import nyx.connections.conn_entry + import nyx.util.tracker + + 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 + elif connection.local_port in controller.get_ports(Listener.DIR, []): + return nyx.connections.conn_entry.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 + 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) + + if not destination_fingerprint: + # Not a known relay. This might be an exit connection. + + exit_policy = controller.get_exit_policy(None) + + 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. + + return nyx.connections.conn_entry.Category.DIRECTORY if len(circ.path) == 1 else nyx.connections.conn_entry.Category.CIRCUIT + + return nyx.connections.conn_entry.Category.OUTBOUND

1 0

[nyx/master] Retrieve the pid along with the process name
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 94a592de40006ac69c41e223362deef15b70c353 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jul 27 09:52:08 2015 -0700 Retrieve the pid along with the process name Our connection panel wants both the process name and pid. Why not? It's already right there... --- nyx/util/tracker.py | 26 +++++++++++++++++--------- test/util/tracker/port_usage_tracker.py | 4 ++-- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/nyx/util/tracker.py b/nyx/util/tracker.py index 48697dc..ebb3b84 100644 --- a/nyx/util/tracker.py +++ b/nyx/util/tracker.py @@ -85,6 +85,11 @@ Resources = collections.namedtuple('Resources', [ 'timestamp', ]) +Process = collections.namedtuple('Process', [ + 'pid', + 'name', +]) + def get_connection_tracker(): """ @@ -248,7 +253,7 @@ def _process_for_ports(local_ports, remote_ports): :param list local_ports: local port numbers to look up :param list remote_ports: remote port numbers to look up - :returns: **dict** mapping the ports to the associated process names + :returns: **dict** mapping the ports to the associated **Process** :raises: **IOError** if unsuccessful """ @@ -257,12 +262,15 @@ def _process_for_ports(local_ports, remote_ports): line_comp = line.split() if not line: - return None, None, None # blank line + return None, None, None, None # blank line elif len(line_comp) != 10: - raise ValueError('lines are expected to have ten fields') + raise ValueError('lines are expected to have ten fields: %s' % line) elif line_comp[9] != '(ESTABLISHED)': - return None, None, None # connection isn't established + return None, None, None, None # connection isn't established + elif not line_comp[1].isdigit(): + raise ValueError('expected the pid (which is the second value) to be an integer: %s' % line) + pid = int(line_comp[1]) cmd = line_comp[0] port_map = line_comp[8] @@ -282,7 +290,7 @@ def _process_for_ports(local_ports, remote_ports): elif not connection.is_valid_port(remote_port): raise ValueError("'%s' isn't a valid port" % remote_port) - return int(local_port), int(remote_port), cmd + return int(local_port), int(remote_port), pid, cmd # atagar@fenrir:~/Desktop/nyx$ lsof -i tcp:51849 -i tcp:37277 # COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE NAME @@ -302,12 +310,12 @@ def _process_for_ports(local_ports, remote_ports): for line in lsof_call: try: - local_port, remote_port, cmd = _parse_lsof_line(line) + local_port, remote_port, pid, cmd = _parse_lsof_line(line) if local_port in local_ports: - results[local_port] = cmd + results[local_port] = Process(pid, cmd) elif remote_port in remote_ports: - results[remote_port] = cmd + results[remote_port] = Process(pid, cmd) except ValueError as exc: raise IOError('unrecognized output from lsof (%s): %s' % (exc, line)) @@ -668,7 +676,7 @@ class PortUsageTracker(Daemon): :param list ports: port numbers to look up - :returns: **dict** mapping port numbers to the process using it + :returns: **dict** mapping port numbers to the **Process** using it """ self._last_requested_ports = ports diff --git a/test/util/tracker/port_usage_tracker.py b/test/util/tracker/port_usage_tracker.py index 219344f..8528e69 100644 --- a/test/util/tracker/port_usage_tracker.py +++ b/test/util/tracker/port_usage_tracker.py @@ -1,7 +1,7 @@ import time import unittest -from nyx.util.tracker import PortUsageTracker, _process_for_ports +from nyx.util.tracker import Process, PortUsageTracker, _process_for_ports from mock import Mock, patch @@ -50,7 +50,7 @@ class TestPortUsageTracker(unittest.TestCase): self.assertEqual({}, _process_for_ports([80, 443], [])) self.assertEqual({}, _process_for_ports([], [80, 443])) - self.assertEqual({37277: 'python', 51849: 'tor'}, _process_for_ports([37277], [51849])) + self.assertEqual({37277: Process(2462, 'python'), 51849: Process(2001, 'tor')}, _process_for_ports([37277], [51849])) @patch('nyx.util.tracker.system.call') def test_process_for_ports_malformed(self, call_mock):

1 0

[nyx/master] Merging ConnectionEntry into parent class
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 3d48452bf48d7e125aecb127e85f10e0ca6dae90 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 25 18:11:52 2015 -0700 Merging ConnectionEntry into parent class What a mess. The ConnectionEntry was the sole subclass of the parent. I see what I was intending to do with the separation, but... seriously? *sigh* --- nyx/connections/conn_entry.py | 52 -------------------------------- nyx/connections/conn_panel.py | 2 +- nyx/connections/entries.py | 67 +++++++++++++++++++++++++++++------------ 3 files changed, 48 insertions(+), 73 deletions(-) diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index 7693982..ec1779e 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -42,10 +42,6 @@ CATEGORY_COLOR = { LABEL_FORMAT = '%s --> %s %s%s' LABEL_MIN_PADDING = 2 # min space between listing label and following data -# sort value for scrubbed ip addresses - -SCRUBBED_IP_VAL = 255 ** 4 - CONFIG = conf.config_dict('nyx', { 'features.connection.markInitialConnections': True, 'features.connection.showIps': True, @@ -119,54 +115,6 @@ class Endpoint: return default -class ConnectionEntry(entries.ConnectionPanelEntry): - """ - Represents a connection being made to or from this system. These only - concern real connections so it includes the inbound, outbound, directory, - application, and controller categories. - """ - - def __init__(self, conn): - entries.ConnectionPanelEntry.__init__(self) - self.connection = conn - self.lines = [ConnectionLine(conn)] - - def get_sort_value(self, attr, listing_type): - """ - Provides the value of a single attribute used for sorting purposes. - """ - - connection_line = self.lines[0] - - if attr == entries.SortAttr.IP_ADDRESS: - if connection_line.is_private(): - return SCRUBBED_IP_VAL # orders at the end - - return connection_line.sort_address - elif attr == entries.SortAttr.PORT: - return connection_line.sort_port - elif attr == entries.SortAttr.FINGERPRINT: - return connection_line.foreign.get_fingerprint('UNKNOWN') - elif attr == entries.SortAttr.NICKNAME: - my_nickname = connection_line.foreign.get_nickname() - - if my_nickname: - return my_nickname.lower() - else: - return 'z' * 20 # orders at the end - elif attr == entries.SortAttr.CATEGORY: - return Category.index_of(connection_line.get_type()) - elif attr == entries.SortAttr.UPTIME: - return self.connection.start_time - elif attr == entries.SortAttr.COUNTRY: - if connection.is_private_address(self.lines[0].foreign.get_address()): - return '' - else: - return connection_line.foreign.get_locale('') - else: - return entries.ConnectionPanelEntry.get_sort_value(self, attr, listing_type) - - class ConnectionLine(entries.ConnectionPanelLine): """ Display component of the ConnectionEntry. diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py index 364c42f..18fe7e7 100644 --- a/nyx/connections/conn_panel.py +++ b/nyx/connections/conn_panel.py @@ -470,7 +470,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): current_resolution_count = conn_resolver.run_counter() with self._vals_lock: - new_entries = [conn_entry.ConnectionEntry(conn) for conn in conn_resolver.get_value()] + new_entries = [entries.ConnectionPanelEntry.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 diff --git a/nyx/connections/entries.py b/nyx/connections/entries.py index f4693b0..301b457 100644 --- a/nyx/connections/entries.py +++ b/nyx/connections/entries.py @@ -29,32 +29,36 @@ SORT_COLORS = { PORT_COUNT = 65536 +# sort value for scrubbed ip addresses + +SCRUBBED_IP_VAL = 255 ** 4 + def to_unix_time(dt): return (dt - datetime.datetime(1970, 1, 1)).total_seconds() class ConnectionPanelEntry: - """ - Common parent for connection panel entries. This consists of a list of lines - in the panel listing. This caches results until the display indicates that - they should be flushed. - """ - - def __init__(self): + def __init__(self, start_time): self.lines = [] self.flush_cache = True + self.start_time = start_time + self.lines = [] + + @staticmethod + def from_connection(conn): + import nyx.connections.conn_entry + + entry = ConnectionPanelEntry(conn.start_time) + entry.lines = [nyx.connections.conn_entry.ConnectionLine(conn)] + return entry @staticmethod def from_circuit(circ): import nyx.connections.circ_entry - import nyx.connections.conn_entry import nyx.util.tracker - # TODO: should be ConnectionPanelEntry rather than a ConnectionEntry, but - # looks like that presently provides sorting - - entry = nyx.connections.conn_entry.ConnectionEntry(nyx.util.tracker.Connection(to_unix_time(circ.created), False, '127.0.0.1', 0, '127.0.0.1', 0, 'tcp')) + entry = ConnectionPanelEntry(to_unix_time(circ.created)) entry.lines = [nyx.connections.circ_entry.CircHeaderLine(circ)] path = [path_entry[0] for path_entry in circ.path] @@ -116,14 +120,37 @@ class ConnectionPanelEntry: def get_sort_value(self, attr, listing_type): """ Provides the value of a single attribute used for sorting purposes. - - Arguments: - attr - list of SortAttr values for the field being sorted on - listing_type - ListingType enumeration for the attribute we're listing - entries by """ - if attr == SortAttr.LISTING: + connection_line = self.lines[0] + + if attr == SortAttr.IP_ADDRESS: + if connection_line.is_private(): + return SCRUBBED_IP_VAL # orders at the end + + return connection_line.sort_address + elif attr == SortAttr.PORT: + return connection_line.sort_port + elif attr == SortAttr.FINGERPRINT: + return connection_line.foreign.get_fingerprint('UNKNOWN') + elif attr == SortAttr.NICKNAME: + my_nickname = connection_line.foreign.get_nickname() + + if my_nickname: + return my_nickname.lower() + else: + return 'z' * 20 # orders at the end + elif attr == SortAttr.CATEGORY: + import nyx.connections.conn_entry + return nyx.connections.conn_entry.Category.index_of(connection_line.get_type()) + elif attr == SortAttr.UPTIME: + return self.start_time + elif attr == SortAttr.COUNTRY: + if connection_line.connection.is_private_address(self.lines[0].foreign.get_address()): + return '' + else: + return connection_line.foreign.get_locale('') + elif attr == SortAttr.LISTING: if listing_type == ListingType.IP_ADDRESS: # uses the IP address as the primary value, and port as secondary sort_value = self.get_sort_value(SortAttr.IP_ADDRESS, listing_type) * PORT_COUNT @@ -133,8 +160,8 @@ class ConnectionPanelEntry: return self.get_sort_value(SortAttr.FINGERPRINT, listing_type) elif listing_type == ListingType.NICKNAME: return self.get_sort_value(SortAttr.NICKNAME, listing_type) - - return '' + else: + return '' def reset_display(self): """

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2015