tor-commits September 2015

tor-commits@lists.torproject.org

15 participants
1411 discussions

[nyx/master] Use get_hidden_service_conf() to read hidden service config
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 0bc5d0dc6d492089459495b43d860384bdfb2f1b Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 7 09:53:12 2015 -0700 Use get_hidden_service_conf() to read hidden service config Using Stem's get_hidden_service_conf() method to read the hidden service configuration rather than parsing it ourselves. --- nyx/connections/conn_entry.py | 50 ++++++----------------------------------- 1 file changed, 7 insertions(+), 43 deletions(-) diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index 61f2508..dbfc097 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -241,7 +241,13 @@ class ConnectionLine(entries.ConnectionPanelLine): my_dir_port = controller.get_conf('DirPort', None) my_socks_port = controller.get_conf('SocksPort', '9050') my_ctl_port = controller.get_conf('ControlPort', None) - my_hidden_service_ports = get_hidden_service_ports(controller) + + # get all target ports in our hidden service configuation + + my_hidden_service_ports = [] + + for hs_config in controller.get_hidden_service_conf({}).values(): + my_hidden_service_ports += [entry[2] for entry in hs_config['HiddenServicePort']] # the ORListenAddress can overwrite the ORPort @@ -882,48 +888,6 @@ class ConnectionLine(entries.ConnectionPanelLine): return destination_address[:max_length] -def get_hidden_service_ports(controller, default = []): - """ - Provides the target ports hidden services are configured to use. - - Arguments: - default - value provided back if unable to query the hidden service ports - """ - - result = [] - hs_options = controller.get_conf_map('HiddenServiceOptions', {}) - - for entry in hs_options.get('HiddenServicePort', []): - # HiddenServicePort entries are of the form... - # - # VIRTPORT [TARGET] - # - # ... with the TARGET being an address, port, or address:port. If the - # target port isn't defined then uses the VIRTPORT. - - hs_port = None - - if ' ' in entry: - virtport, target = entry.split(' ', 1) - - if ':' in target: - hs_port = target.split(':', 1)[1] # target is an address:port - elif target.isdigit(): - hs_port = target # target is a port - else: - hs_port = virtport # target is an address - else: - hs_port = entry # just has the virtual port - - if hs_port.isdigit(): - result.append(hs_port) - - if result: - return result - else: - return default - - def is_exiting_allowed(controller, ip_address, port): """ Checks if the given destination can be exited to by this relay, returning

1 0

[nyx/master] Replace helper methods with is_user_traffic_allowed()
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 3d75f6cdef4d05ed2cc9ccfe4db8c86deac63659 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 4 15:29:08 2015 -0700 Replace helper methods with is_user_traffic_allowed() Taking advantage of Stem's new method that does this. --- nyx/connections/conn_entry.py | 15 +------------- nyx/connections/conn_panel.py | 43 +++++++---------------------------------- 2 files changed, 8 insertions(+), 50 deletions(-) diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index 714661e..7d41a8a 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -420,23 +420,10 @@ class ConnectionLine(entries.ConnectionPanelLine): my_type = self.get_type() if my_type == Category.INBOUND: - # if we're a guard or bridge and the connection doesn't belong to a - # known relay then it might be client traffic - controller = tor_controller() - my_flags = [] - my_fingerprint = self.get_info('fingerprint', None) - - if my_fingerprint: - my_status_entry = self.controller.get_network_status(my_fingerprint) - - if my_status_entry: - my_flags = my_status_entry.flags - - if 'Guard' in my_flags or controller.get_conf('BridgeRelay', None) == '1': + if controller.is_user_traffic_allowed().inbound: all_matches = get_fingerprint_tracker().get_relay_fingerprint(self.foreign.get_address(), get_all_matches = True) - return all_matches == [] elif my_type == Category.EXIT: # DNS connections exiting us aren't private (since they're hitting our diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py index 1402b71..5c4a17a 100644 --- a/nyx/connections/conn_panel.py +++ b/nyx/connections/conn_panel.py @@ -200,38 +200,6 @@ class ConnectionPanel(panel.Panel, threading.Thread): if entries.SortAttr.LISTING in CONFIG['features.connection.order']: self.set_sort_order() - def is_clients_allowed(self): - """ - True if client connections are permissable, false otherwise. - """ - - controller = tor_controller() - - my_flags = [] - my_fingerprint = controller.get_info('fingerprint', None) - - if my_fingerprint: - my_status_entry = controller.get_network_status(my_fingerprint) - - if my_status_entry: - my_flags = my_status_entry.flags - - return 'Guard' in my_flags or controller.get_conf('BridgeRelay', None) == '1' - - def is_exits_allowed(self): - """ - True if exit connections are permissable, false otherwise. - """ - - controller = tor_controller() - - if not controller.get_conf('ORPort', None): - return False # no ORPort - - policy = controller.get_exit_policy(None) - - return policy and policy.is_exiting_allowed() - def show_sort_dialog(self): """ Provides the sort dialog for our connections. @@ -250,6 +218,8 @@ class ConnectionPanel(panel.Panel, threading.Thread): def handle_key(self, key): with self.vals_lock: + user_traffic_allowed = tor_controller().is_user_traffic_allowed() + if key.is_scroll(): page_height = self.get_preferred_size()[0] - 1 @@ -327,9 +297,9 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.set_title_visible(True) self.redraw(True) - elif key.match('c') and self.is_clients_allowed(): + elif key.match('c') and user_traffic_allowed.inbound: nyx.popups.show_count_dialog('Client Locales', self._client_locale_usage) - elif key.match('e') and self.is_exits_allowed(): + elif key.match('e') and user_traffic_allowed.outbound: counts = {} key_width = max(map(len, self._exit_port_usage.keys())) @@ -385,6 +355,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): def get_help(self): resolver_util = nyx.util.tracker.get_connection_tracker().get_custom_resolver() + user_traffic_allowed = tor_controller().is_user_traffic_allowed() options = [ ('up arrow', 'scroll up a line', None), @@ -395,10 +366,10 @@ class ConnectionPanel(panel.Panel, threading.Thread): ('d', 'raw consensus descriptor', None), ] - if self.is_clients_allowed(): + if user_traffic_allowed.inbound: options.append(('c', 'client locale usage summary', None)) - if self.is_exits_allowed(): + if user_traffic_allowed.outbound: options.append(('e', 'exit port usage summary', None)) options.append(('l', 'listed identity', self.get_listing_type().lower()))

1 0

[nyx/master] Drop everything related to connection hostnames
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 44237aca4c6173637e7e70d6e971fd0dce799c07 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 7 09:26:17 2015 -0700 Drop everything related to connection hostnames This has been dead code for years. Once upon a time arm resolved which is neat! But this involved active queries, which leaks a relay's circuits to their dns resolver. We can fix this by querying all relays (rather than just ours), but likely overly wasteful. Needs more investigation. Regardless, it's been dead code for quite some time now so about time we drop it. We can re-introduce something when we have hostname resolution once again. --- nyx/connections/circ_entry.py | 11 +---- nyx/connections/conn_entry.py | 98 +++-------------------------------------- nyx/connections/conn_panel.py | 6 +-- nyx/connections/entries.py | 7 +-- nyx/menu/actions.py | 1 - nyx/resources/nyx.1 | 2 +- 6 files changed, 11 insertions(+), 114 deletions(-) diff --git a/nyx/connections/circ_entry.py b/nyx/connections/circ_entry.py index b3dc113..63108ca 100644 --- a/nyx/connections/circ_entry.py +++ b/nyx/connections/circ_entry.py @@ -101,11 +101,11 @@ class CircHeaderLine(conn_entry.ConnectionLine): def get_type(self): return conn_entry.Category.CIRCUIT - def get_destination_label(self, max_length, include_locale=False, include_hostname=False): + def get_destination_label(self, max_length, include_locale = False): if not self.is_built: return 'Building...' - return conn_entry.ConnectionLine.get_destination_label(self, max_length, include_locale, include_hostname) + return conn_entry.ConnectionLine.get_destination_label(self, max_length, include_locale) def get_etc_content(self, width, listing_type): """ @@ -187,7 +187,6 @@ class CircLine(conn_entry.ConnectionLine): dst, etc = '', '' if listing_type == entries.ListingType.IP_ADDRESS: - # TODO: include hostname when that's available # dst width is derived as: # src (21) + dst (26) + divider (7) + right gap (2) - bracket (3) = 53 char @@ -198,12 +197,6 @@ class CircLine(conn_entry.ConnectionLine): dst = '%s%-25s ' % (dst[:25], str_tools.crop(self.foreign.get_nickname(), 25, 0)) etc = self.get_etc_content(width - baseline_space - len(dst), listing_type) - elif listing_type == entries.ListingType.HOSTNAME: - # min space for the hostname is 40 characters - - etc = self.get_etc_content(width - baseline_space - 40, listing_type) - dst_layout = '%%-%is' % (width - baseline_space - len(etc)) - dst = dst_layout % self.foreign.get_hostname(self.foreign.get_address()) elif listing_type == entries.ListingType.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 562a4b4..61f2508 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -105,28 +105,6 @@ class Endpoint: return self.port - def get_hostname(self, default = None): - """ - Provides the hostname associated with the relay's address. This is a - non-blocking call and returns None if the address either can't be resolved - or hasn't been resolved yet. - - Arguments: - default - return value if no hostname is available - """ - - # TODO: skipping all hostname resolution to be safe for now - # try: - # myHostname = hostnames.resolve(self.address) - # except: - # # either a ValueError or IOError depending on the source of the lookup failure - # myHostname = None - # - # if not myHostname: return default - # else: return myHostname - - return default - def get_locale(self, default=None): """ Provides the two letter country code for the IP address' locale. @@ -204,11 +182,6 @@ class ConnectionEntry(entries.ConnectionPanelEntry): return connection_line.sort_address elif attr == entries.SortAttr.PORT: return connection_line.sort_port - elif attr == entries.SortAttr.HOSTNAME: - if connection_line.is_private(): - return '' - - return connection_line.foreign.get_hostname('') elif attr == entries.SortAttr.FINGERPRINT: return connection_line.foreign.get_fingerprint() elif attr == entries.SortAttr.NICKNAME: @@ -320,11 +293,6 @@ class ConnectionLine(entries.ConnectionPanelLine): dst - <destination addr:port> etc - <fingerprint> <nickname> - ListingType.HOSTNAME: - src - localhost:<port> - dst - <destination hostname:port> - etc - <destination addr:port> <fingerprint> <nickname> - ListingType.FINGERPRINT: src - localhost dst - <destination fingerprint> @@ -553,23 +521,6 @@ class ConnectionLine(entries.ConnectionPanelLine): nickname_label = str_tools.crop(self.foreign.get_nickname(), nickname_space, 0) etc += ('%%-%is ' % nickname_space) % nickname_label used_space += nickname_space + 2 - elif listing_type == entries.ListingType.HOSTNAME: - if width > used_space + 28 and CONFIG['features.connection.showColumn.destination']: - # show destination ip/port/locale (column width: 28 characters) - etc += '%-26s ' % destination_address - used_space += 28 - - if width > used_space + 42 and CONFIG['features.connection.showColumn.fingerprint']: - # show fingerprint (column width: 42 characters) - etc += '%-40s ' % self.foreign.get_fingerprint() - used_space += 42 - - if width > used_space + 17 and CONFIG['features.connection.showColumn.nickname']: - # show nickname (column width: min 17 characters, uses half of the remainder) - nickname_space = 15 + (width - (used_space + 17)) / 2 - nickname_label = str_tools.crop(self.foreign.get_nickname(), nickname_space, 0) - etc += ('%%-%is ' % nickname_space) % nickname_label - used_space += (nickname_space + 2) elif listing_type == entries.ListingType.FINGERPRINT: if width > used_space + 17: # show nickname (column width: min 17 characters, consumes any remaining space) @@ -650,9 +601,9 @@ class ConnectionLine(entries.ConnectionPanelLine): if my_type in (Category.SOCKS, Category.CONTROL): # Like inbound connections these need their source and destination to - # be swapped. However, this only applies when listing by IP or hostname - # (their fingerprint and nickname are both for us). Reversing the - # fields here to keep the same column alignments. + # be swapped. However, this only applies when listing by IP (their + # fingerprint and nickname are both for us). Reversing the fields here + # to keep the same column alignments. src = '%-21s' % destination_address dst = '%-26s' % src_address @@ -689,31 +640,6 @@ class ConnectionLine(entries.ConnectionPanelLine): etc = self.get_etc_content(width - used_space, listing_type) used_space += len(etc) - elif listing_type == entries.ListingType.HOSTNAME: - # 15 characters for source, and a min of 40 reserved for the destination - # TODO: when actually functional the src and dst need to be swapped for - # SOCKS and CONTROL connections - - src = 'localhost%-6s' % local_port - used_space += len(src) - min_hostname_space = 40 - - etc = self.get_etc_content(width - used_space - min_hostname_space, listing_type) - used_space += len(etc) - - hostname_space = width - used_space - used_space = width # prevents padding at the end - - if self.is_private(): - dst = ('%%-%is' % hostname_space) % '<scrubbed>' - else: - hostname = self.foreign.get_hostname(self.foreign.get_address()) - port_label = ':%-5s' % self.foreign.get_port() if self.include_port else '' - - # truncates long hostnames and sets dst to <hostname>:<port> - - hostname = str_tools.crop(hostname, hostname_space, 0) - dst = ('%%-%is' % hostname_space) % (hostname + port_label) elif listing_type == entries.ListingType.FINGERPRINT: src = 'localhost' @@ -894,7 +820,7 @@ class ConnectionLine(entries.ConnectionPanelLine): return lines - def get_destination_label(self, max_length, include_locale = False, include_hostname = False): + def get_destination_label(self, max_length, include_locale = False): """ Provides a short description of the destination. This is made up of two components, the base <ip addr>:<port> and an extra piece of information in @@ -902,14 +828,12 @@ class ConnectionLine(entries.ConnectionPanelLine): Extra information is... - the port's purpose for exit connections - - the locale and/or hostname if set to do so, the address isn't private, - and isn't on the local network + - the locale, the address isn't private and isn't on the local network - nothing otherwise Arguments: max_length - maximum length of the string returned include_locale - possibly includes the locale - include_hostname - possibly includes the hostname """ # the port and port derived data can be hidden by config or without include_port @@ -952,18 +876,6 @@ class ConnectionLine(entries.ConnectionPanelLine): extra_info.append(foreign_locale) space_available -= len(foreign_locale) + 2 - if include_hostname: - destination_hostname = self.foreign.get_hostname() - - if destination_hostname: - # determines the full space available, taking into account the ", " - # dividers if there's multiple pieces of extra data - - max_hostname_space = space_available - 2 * len(extra_info) - destination_hostname = str_tools.crop(destination_hostname, max_hostname_space) - extra_info.append(destination_hostname) - space_available -= len(destination_hostname) - if extra_info: destination_address += ' (%s)' % ', '.join(extra_info) diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py index f74c245..2be5f8b 100644 --- a/nyx/connections/conn_panel.py +++ b/nyx/connections/conn_panel.py @@ -22,7 +22,7 @@ DETAILS_HEIGHT = 7 # listing types -Listing = enum.Enum(('IP_ADDRESS', 'IP Address'), 'HOSTNAME', 'FINGERPRINT', 'NICKNAME') +Listing = enum.Enum(('IP_ADDRESS', 'IP Address'), 'FINGERPRINT', 'NICKNAME') EXIT_USAGE_WIDTH = 15 UPDATE_RATE = 5 # rate in seconds at which we refresh @@ -257,10 +257,6 @@ class ConnectionPanel(panel.Panel, threading.Thread): title = 'List By:' options = list(entries.ListingType) - # dropping the HOSTNAME listing type until we support displaying that content - - options.remove(nyx.connections.entries.ListingType.HOSTNAME) - old_selection = options.index(self.get_listing_type()) selection = nyx.popups.show_menu(title, options, old_selection) diff --git a/nyx/connections/entries.py b/nyx/connections/entries.py index d034aa2..68c8cb8 100644 --- a/nyx/connections/entries.py +++ b/nyx/connections/entries.py @@ -8,9 +8,9 @@ from stem.util import enum # attributes we can list entries by -ListingType = enum.Enum(('IP_ADDRESS', 'IP Address'), 'HOSTNAME', 'FINGERPRINT', 'NICKNAME') +ListingType = enum.Enum(('IP_ADDRESS', 'IP Address'), 'FINGERPRINT', 'NICKNAME') -SortAttr = enum.Enum('CATEGORY', 'UPTIME', 'LISTING', 'IP_ADDRESS', 'PORT', 'HOSTNAME', 'FINGERPRINT', 'NICKNAME', 'COUNTRY') +SortAttr = enum.Enum('CATEGORY', 'UPTIME', 'LISTING', 'IP_ADDRESS', 'PORT', 'FINGERPRINT', 'NICKNAME', 'COUNTRY') SORT_COLORS = { SortAttr.CATEGORY: 'red', @@ -18,7 +18,6 @@ SORT_COLORS = { SortAttr.LISTING: 'green', SortAttr.IP_ADDRESS: 'blue', SortAttr.PORT: 'blue', - SortAttr.HOSTNAME: 'magenta', SortAttr.FINGERPRINT: 'cyan', SortAttr.NICKNAME: 'cyan', SortAttr.COUNTRY: 'blue', @@ -88,8 +87,6 @@ class ConnectionPanelEntry: sort_value = self.get_sort_value(SortAttr.IP_ADDRESS, listing_type) * PORT_COUNT sort_value += self.get_sort_value(SortAttr.PORT, listing_type) return sort_value - elif listing_type == ListingType.HOSTNAME: - return self.get_sort_value(SortAttr.HOSTNAME, listing_type) elif listing_type == ListingType.FINGERPRINT: return self.get_sort_value(SortAttr.FINGERPRINT, listing_type) elif listing_type == ListingType.NICKNAME: diff --git a/nyx/menu/actions.py b/nyx/menu/actions.py index 25b7c14..42d4bb3 100644 --- a/nyx/menu/actions.py +++ b/nyx/menu/actions.py @@ -249,7 +249,6 @@ def make_connections_menu(conn_panel): listing_group = nyx.menu.item.SelectionGroup(conn_panel.set_listing_type, conn_panel.get_listing_type()) listing_options = list(nyx.connections.entries.ListingType) - listing_options.remove(nyx.connections.entries.ListingType.HOSTNAME) for option in listing_options: connections_menu.add(nyx.menu.item.SelectionMenuItem(option, listing_group, option)) diff --git a/nyx/resources/nyx.1 b/nyx/resources/nyx.1 index d82528a..a2a8d40 100644 --- a/nyx/resources/nyx.1 +++ b/nyx/resources/nyx.1 @@ -13,7 +13,7 @@ providing real time statistics for: * bandwidth, cpu, and memory usage * relay's current configuration * logged events - * connection details (ip, hostname, fingerprint, and consensus data) + * connection details (ip, fingerprint, and consensus data) * etc Defaults and interface properties are configurable via a user provided

1 0

[nyx/master] Port of zero causes stacktrace
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit d85d1561bee357eee7a84f8fdbd8c454db31a108 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jul 6 10:01:41 2015 -0700 Port of zero causes stacktrace Somehow an entry of '0.0.0.0:0' is among my outbound connections. Proper fix will be to figure out where that's coming from, but for now just making a quick hack so we don't error... File "/home/atagar/Desktop/nyx/nyx/connections/conn_entry.py", line 469, in get_type if is_exiting_allowed(controller, self.foreign.get_address(), self.foreign.get_port()): File "/home/atagar/Desktop/nyx/nyx/connections/conn_entry.py", line 1035, in is_exiting_allowed result = our_policy and our_policy.can_exit_to(ip_address, port) File "/home/atagar/Desktop/nyx/stem/util/lru_cache.py", line 135, in wrapper result = user_function(*args, **kwds) File "/home/atagar/Desktop/nyx/stem/exit_policy.py", line 286, in can_exit_to if rule.is_match(address, port, strict): File "/home/atagar/Desktop/nyx/stem/exit_policy.py", line 749, in is_match raise ValueError("'%s' isn't a valid port" % port) ValueError: '0' isn't a valid port --- nyx/connections/conn_entry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index 7d41a8a..562a4b4 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -466,7 +466,7 @@ class ConnectionLine(entries.ConnectionPanelLine): if destination_fingerprint == 'UNKNOWN': # Not a known relay. This might be an exit connection. - if is_exiting_allowed(controller, self.foreign.get_address(), self.foreign.get_port()): + if is_exiting_allowed(controller, self.foreign.get_address(), self.foreign.get_port() if self.foreign.get_port() else None): self.cached_type = Category.EXIT elif self._possible_client or self._possible_directory: # This belongs to a known relay. If we haven't eliminated ourselves as

1 0

[nyx/master] Merge _get_relay_fingerprint() helper method
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 2d9e479751ca0e07540df211989198a8918dbc88 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 11 10:34:05 2015 -0700 Merge _get_relay_fingerprint() helper method We have both get_relay_fingerprint() and _get_relay_fingerprint(). The later actually doesn't do much, in effect just disambiguating based on an optional port argument. Combining the functions. --- nyx/connections/conn_entry.py | 113 +++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 72 deletions(-) diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index 73fe17d..299ca89 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -897,10 +897,6 @@ class FingerprintTracker: self._fingerprint_mappings = None - # lookup cache with (ip, port) -> fingerprint mappings - - self._fingerprint_lookup_cache = {} - # lookup cache with fingerprint -> nickname mappings self._nickname_lookup_cache = {} @@ -911,7 +907,6 @@ class FingerprintTracker: controller.add_event_listener(self.new_desc_event, stem.control.EventType.NEWDESC) def new_consensus_event(self, event): - self._fingerprint_lookup_cache = {} self._nickname_lookup_cache = {} if self._fingerprint_mappings is not None: @@ -921,8 +916,6 @@ class FingerprintTracker: # If we're tracking ip address -> fingerprint mappings then update with # the new relays. - self._fingerprint_lookup_cache = {} - if self._fingerprint_mappings is not None: desc_fingerprints = [fingerprint for (fingerprint, nickname) in event.relays] @@ -971,28 +964,53 @@ class FingerprintTracker: address """ - result = None controller = tor_controller() - if controller.is_alive(): - if get_all_matches: - # populates the ip -> fingerprint mappings if not yet available - if self._fingerprint_mappings is None: - self._fingerprint_mappings = self._get_fingerprint_mappings() + # TODO: normalize callers + + if isinstance(relay_port, str): + relay_port = int(relay_port) + + if not controller.is_alive(): + return None + + # checks if this matches us + + if not get_all_matches and relay_address == controller.get_info('address', None): + if not relay_port or relay_port in controller.get_ports(stem.control.Listener.OR, []): + return controller.get_info('fingerprint', None) - if relay_address in self._fingerprint_mappings: - result = self._fingerprint_mappings[relay_address] + # populates the ip -> fingerprint mappings if not yet available + + if self._fingerprint_mappings is None: + self._fingerprint_mappings = self._get_fingerprint_mappings() + + if get_all_matches: + return self._fingerprint_mappings.get(relay_address, []) + else: + potential_matches = self._fingerprint_mappings.get(relay_address) + + if not potential_matches: + return None # no relay matches this ip address + + if len(potential_matches) == 1: + # There's only one relay belonging to this ip address. If the port + # matches then we're done. + + match = potential_matches[0] + + if relay_port and match[0] != relay_port: + return None else: - result = [] - else: - # query the fingerprint if it isn't yet cached - if (relay_address, relay_port) not in self._fingerprint_lookup_cache: - relay_fingerprint = self._get_relay_fingerprint(controller, relay_address, relay_port) - self._fingerprint_lookup_cache[(relay_address, relay_port)] = relay_fingerprint + return match[1] + elif relay_port: + # multiple potential matches, so trying to match based on the port - result = self._fingerprint_lookup_cache[(relay_address, relay_port)] + for entry_port, entry_fingerprint in potential_matches: + if entry_port == relay_port: + return entry_fingerprint - return result + return None def get_relay_nickname(self, relay_fingerprint): """ @@ -1023,55 +1041,6 @@ class FingerprintTracker: return result - def _get_relay_fingerprint(self, controller, relay_address, relay_port): - """ - Provides the fingerprint associated with the address/port combination. - - Arguments: - relay_address - address of relay to be returned - relay_port - orport of relay (to further narrow the results) - """ - - # If we were provided with a string port then convert to an int (so - # lookups won't mismatch based on type). - - if isinstance(relay_port, str): - relay_port = int(relay_port) - - # checks if this matches us - - if relay_address == controller.get_info('address', None): - if not relay_port or str(relay_port) == controller.get_conf('ORPort', None): - return controller.get_info('fingerprint', None) - - # if we haven't yet populated the ip -> fingerprint mappings then do so - - if self._fingerprint_mappings is None: - self._fingerprint_mappings = self._get_fingerprint_mappings() - - potential_matches = self._fingerprint_mappings.get(relay_address) - - if not potential_matches: - return None # no relay matches this ip address - - if len(potential_matches) == 1: - # There's only one relay belonging to this ip address. If the port - # matches then we're done. - - match = potential_matches[0] - - if relay_port and match[0] != relay_port: - return None - else: - return match[1] - elif relay_port: - # Multiple potential matches, so trying to match based on the port. - for entry_port, entry_fingerprint in potential_matches: - if entry_port == relay_port: - return entry_fingerprint - - return None - def _get_fingerprint_mappings(self, descriptors = None): """ Provides IP address to (port, fingerprint) tuple mappings for all of the

1 0

[nyx/master] Move FingerprintTracker to tracker util
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 6ed5a561c2b42b48ca3edca0905926979194e3a6 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 12 13:42:49 2015 -0700 Move FingerprintTracker to tracker util When picking apart our old tor_tools I plopped the FingerprintTracker into the conn_entry because that is its sole caller. However, now that I've cleaned it up it's time to find a more permanent home. As the name suggests it's similar to the other trackers, so moving it there. Also renaming it to ConsensusTracker because it's used to provide performant lookups of any consensus information we need (not just fingerprints). --- nyx/connections/conn_entry.py | 115 ++------------------------------------ nyx/connections/conn_panel.py | 2 +- nyx/util/tracker.py | 123 ++++++++++++++++++++++++++++++++++++++++- 3 files changed, 127 insertions(+), 113 deletions(-) diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index 5cb4274..317da22 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -6,13 +6,12 @@ Connection panel entries related to actual connections to or from the system import time import curses +import nyx.util.tracker import nyx.util.ui_tools from nyx.util import tor_controller from nyx.connections import entries -import stem.control - from stem.util import conf, connection, enum, str_tools # Connection Categories: @@ -58,17 +57,6 @@ CONFIG = conf.config_dict('nyx', { 'features.connection.showColumn.expandedIp': True, }) -FINGERPRINT_TRACKER = None - - -def get_fingerprint_tracker(): - global FINGERPRINT_TRACKER - - if FINGERPRINT_TRACKER is None: - FINGERPRINT_TRACKER = FingerprintTracker() - - return FINGERPRINT_TRACKER - class Endpoint: """ @@ -125,13 +113,13 @@ class Endpoint: if self.fingerprint_overwrite: return self.fingerprint_overwrite - my_fingerprint = get_fingerprint_tracker().get_relay_fingerprint(self.address) + my_fingerprint = nyx.util.tracker.get_consensus_tracker().get_relay_fingerprint(self.address) # If there were multiple matches and our port is likely the ORPort then # try again with that to narrow the results. if not my_fingerprint and not self.is_not_or_port: - my_fingerprint = get_fingerprint_tracker().get_relay_fingerprint(self.address, int(self.port)) + my_fingerprint = nyx.util.tracker.get_consensus_tracker().get_relay_fingerprint(self.address, int(self.port)) if my_fingerprint: return my_fingerprint @@ -147,7 +135,7 @@ class Endpoint: my_fingerprint = self.get_fingerprint() if my_fingerprint != 'UNKNOWN': - my_nickname = get_fingerprint_tracker().get_relay_nickname(my_fingerprint) + my_nickname = nyx.util.tracker.get_consensus_tracker().get_relay_nickname(my_fingerprint) if my_nickname: return my_nickname @@ -397,7 +385,7 @@ class ConnectionLine(entries.ConnectionPanelLine): controller = tor_controller() if controller.is_user_traffic_allowed().inbound: - all_matches = get_fingerprint_tracker().get_all_relay_fingerprints(self.foreign.get_address()) + all_matches = nyx.util.tracker.get_consensus_tracker().get_all_relay_fingerprints(self.foreign.get_address()) return all_matches == [] elif my_type == Category.EXIT: # DNS connections exiting us aren't private (since they're hitting our @@ -795,7 +783,7 @@ class ConnectionLine(entries.ConnectionPanelLine): if contact: lines[6] = 'contact: %s' % contact else: - all_matches = get_fingerprint_tracker().get_all_relay_fingerprints(self.foreign.get_address()) + all_matches = nyx.util.tracker.get_consensus_tracker().get_all_relay_fingerprints(self.foreign.get_address()) if all_matches: # multiple matches @@ -889,94 +877,3 @@ class ConnectionLine(entries.ConnectionPanelLine): destination_address += ' (%s)' % ', '.join(extra_info) return destination_address[:max_length] - - -class FingerprintTracker: - def __init__(self): - self._fingerprint_cache = {} # {address => [(port, fingerprint), ..]} for relays - self._nickname_cache = {} # fingerprint => nickname lookup cache - - tor_controller().add_event_listener(self._new_consensus_event, stem.control.EventType.NEWCONSENSUS) - - def _new_consensus_event(self, event): - self._nickname_cache = {} - self.update(event.desc) - - def update(self, router_status_entries): - """ - Updates our cache with the given router status entries. - - :param list router_status_entries: router status entries to populate our cache with - """ - - new_fingerprint_cache = {} - - for desc in router_status_entries: - new_fingerprint_cache.setdefault(desc.address, []).append((desc.or_port, desc.fingerprint)) - - self._fingerprint_cache = new_fingerprint_cache - - def get_relay_fingerprint(self, address, port = None): - """ - Provides the relay running at a given location. If there's multiple relays - and no port is provided to disambiguate then this returns **None**. - - :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 - """ - - 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) - - matches = self._fingerprint_cache.get(address, []) - - 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, []) - - def get_relay_nickname(self, fingerprint): - """ - Provides the nickname associated with the given relay. - - :param str fingerprint: relay to look up - - :reutrns: **str** with the nickname ("Unnamed" if unset), and **None** if - no such relay exists - """ - - controller = tor_controller() - - if fingerprint not in self._nickname_cache: - if fingerprint == controller.get_info('fingerprint', None): - self._nickname_cache[fingerprint] = controller.get_conf('Nickname', 'Unnamed') - else: - ns_entry = controller.get_network_status(fingerprint, None) - - if ns_entry: - self._nickname_cache[fingerprint] = ns_entry.nickname if ns_entry.nickname else 'Unnamed' - - return self._nickname_cache.get(fingerprint) diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py index 83b9d3a..7536a8d 100644 --- a/nyx/connections/conn_panel.py +++ b/nyx/connections/conn_panel.py @@ -332,7 +332,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): # iteration to hide the lag. if last_ran == -1: - conn_entry.get_fingerprint_tracker().update(tor_controller().get_network_statuses([])) + nyx.util.tracker.get_consensus_tracker().update(tor_controller().get_network_statuses([])) last_ran = time.time() diff --git a/nyx/util/tracker.py b/nyx/util/tracker.py index 1b51a05..f721c6f 100644 --- a/nyx/util/tracker.py +++ b/nyx/util/tracker.py @@ -6,6 +6,7 @@ Background tasks for gathering information about the tor process. get_connection_tracker - provides a ConnectionTracker for our tor process get_resource_tracker - provides a ResourceTracker for our tor process get_port_usage_tracker - provides a PortUsageTracker for our system + get_consensus_tracker - provides a ConsensusTracker for our tor process stop_trackers - halts any active trackers @@ -27,6 +28,12 @@ Background tasks for gathering information about the tor process. |- set_paused - pauses or continues work +- stop - stops further work by the daemon + 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 + .. data:: Resources Resource usage information retrieved about the tor process. @@ -43,7 +50,8 @@ import collections import time import threading -from stem.control import State +import stem.control + from stem.util import conf, connection, proc, str_tools, system from nyx.util import log, tor_controller @@ -57,6 +65,7 @@ CONFIG = conf.config_dict('nyx', { CONNECTION_TRACKER = None RESOURCE_TRACKER = None PORT_USAGE_TRACKER = None +CONSENSUS_TRACKER = None Resources = collections.namedtuple('Resources', [ 'cpu_sample', @@ -107,6 +116,19 @@ def get_port_usage_tracker(): return PORT_USAGE_TRACKER +def get_consensus_tracker(): + """ + Singleton for tracking the connections established by tor. + """ + + global CONSENSUS_TRACKER + + if CONSENSUS_TRACKER is None: + CONSENSUS_TRACKER = ConsensusTracker() + + return CONSENSUS_TRACKER + + def stop_trackers(): """ Halts active trackers, providing back the thread shutting them down. @@ -305,7 +327,7 @@ class Daemon(threading.Thread): controller = tor_controller() controller.add_status_listener(self._tor_status_listener) - self._tor_status_listener(controller, State.INIT, None) + self._tor_status_listener(controller, stem.control.State.INIT, None) def run(self): while not self._halt: @@ -393,7 +415,7 @@ class Daemon(threading.Thread): def _tor_status_listener(self, controller, event_type, _): with self._process_lock: - if not self._halt and event_type in (State.INIT, State.RESET): + if not self._halt and event_type in (stem.control.State.INIT, stem.control.State.RESET): tor_pid = controller.get_pid(None) tor_cmd = system.name_by_pid(tor_pid) if tor_pid else None @@ -664,3 +686,98 @@ class PortUsageTracker(Daemon): log.debug('tracker.unable_to_get_port_usages', exc = exc) return False + + +class ConsensusTracker(object): + """ + Provides performant lookups of consensus information. + """ + + def __init__(self): + self._fingerprint_cache = {} # {address => [(port, fingerprint), ..]} for relays + self._nickname_cache = {} # fingerprint => nickname lookup cache + + tor_controller().add_event_listener(self._new_consensus_event, stem.control.EventType.NEWCONSENSUS) + + def _new_consensus_event(self, event): + self._nickname_cache = {} + self.update(event.desc) + + def update(self, router_status_entries): + """ + Updates our cache with the given router status entries. + + :param list router_status_entries: router status entries to populate our cache with + """ + + new_fingerprint_cache = {} + + for desc in router_status_entries: + new_fingerprint_cache.setdefault(desc.address, []).append((desc.or_port, desc.fingerprint)) + + self._fingerprint_cache = new_fingerprint_cache + + def get_relay_nickname(self, fingerprint): + """ + Provides the nickname associated with the given relay. + + :param str fingerprint: relay to look up + + :reutrns: **str** with the nickname ("Unnamed" if unset), and **None** if + no such relay exists + """ + + controller = tor_controller() + + if fingerprint not in self._nickname_cache: + if fingerprint == controller.get_info('fingerprint', None): + self._nickname_cache[fingerprint] = controller.get_conf('Nickname', 'Unnamed') + else: + ns_entry = controller.get_network_status(fingerprint, None) + + if ns_entry: + self._nickname_cache[fingerprint] = ns_entry.nickname if ns_entry.nickname else 'Unnamed' + + return self._nickname_cache.get(fingerprint) + + def get_relay_fingerprint(self, address, port = None): + """ + Provides the relay running at a given location. If there's multiple relays + and no port is provided to disambiguate then this returns **None**. + + :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 + """ + + 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) + + matches = self._fingerprint_cache.get(address, []) + + 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, [])

1 0

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

22 Sep '15

commit e925f2dcd88194cfab17f502ed2380e504be65eb Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 11 14:33:56 2015 -0700 Rewrite FingerprintTracker class Probably not quite done yet, but first step was to rewrite this sucker. Now thread safe and far simpler. This also no longer tries to process NEWDESC events. Our checks are based on the consensus (not server/microdescriptors) so simply handling NEWCONSENSUS events should be enough. Getting clarification though... https://trac.torproject.org/projects/tor/ticket/16556 --- nyx/connections/conn_entry.py | 201 +++++++++++++---------------------------- 1 file changed, 61 insertions(+), 140 deletions(-) diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index 299ca89..4d3b278 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -131,7 +131,7 @@ class Endpoint: # try again with that to narrow the results. if not my_fingerprint and not self.is_not_or_port: - my_fingerprint = get_fingerprint_tracker().get_relay_fingerprint(self.address, self.port) + my_fingerprint = get_fingerprint_tracker().get_relay_fingerprint(self.address, int(self.port)) if my_fingerprint: return my_fingerprint @@ -397,7 +397,7 @@ class ConnectionLine(entries.ConnectionPanelLine): controller = tor_controller() if controller.is_user_traffic_allowed().inbound: - all_matches = get_fingerprint_tracker().get_relay_fingerprint(self.foreign.get_address(), get_all_matches = True) + all_matches = get_fingerprint_tracker().get_all_relay_fingerprints(self.foreign.get_address()) return all_matches == [] elif my_type == Category.EXIT: # DNS connections exiting us aren't private (since they're hitting our @@ -795,7 +795,7 @@ class ConnectionLine(entries.ConnectionPanelLine): if contact: lines[6] = 'contact: %s' % contact else: - all_matches = get_fingerprint_tracker().get_relay_fingerprint(self.foreign.get_address(), get_all_matches = True) + all_matches = get_fingerprint_tracker().get_all_relay_fingerprints(self.foreign.get_address()) if all_matches: # multiple matches @@ -893,178 +893,99 @@ class ConnectionLine(entries.ConnectionPanelLine): class FingerprintTracker: def __init__(self): - # mappings of ip -> [(port, fingerprint), ...] + self._fingerprint_cache = None # {address => [(port, fingerprint), ..]} for relays + self._nickname_cache = {} # fingerprint => nickname lookup cache - self._fingerprint_mappings = None + tor_controller().add_event_listener(self._new_consensus_event, stem.control.EventType.NEWCONSENSUS) - # lookup cache with fingerprint -> nickname mappings + def _new_consensus_event(self, event): + self._nickname_cache = {} + self._relay_fingerprints(event.desc) - self._nickname_lookup_cache = {} - - controller = tor_controller() - - controller.add_event_listener(self.new_consensus_event, stem.control.EventType.NEWCONSENSUS) - controller.add_event_listener(self.new_desc_event, stem.control.EventType.NEWDESC) - - def new_consensus_event(self, event): - self._nickname_lookup_cache = {} - - if self._fingerprint_mappings is not None: - self._fingerprint_mappings = self._get_fingerprint_mappings(event.desc) - - def new_desc_event(self, event): - # If we're tracking ip address -> fingerprint mappings then update with - # the new relays. - - if self._fingerprint_mappings is not None: - desc_fingerprints = [fingerprint for (fingerprint, nickname) in event.relays] - - for fingerprint in desc_fingerprints: - # gets consensus data for the new descriptor - - try: - desc = tor_controller().get_network_status(fingerprint) - except stem.ControllerError: - continue - - # updates fingerprintMappings with new data - - if desc.address in self._fingerprint_mappings: - # if entry already exists with the same orport, remove it - - orport_match = None - - for entry_port, entry_fingerprint in self._fingerprint_mappings[desc.address]: - if entry_port == desc.or_port: - orport_match = (entry_port, entry_fingerprint) - break - - if orport_match: - self._fingerprint_mappings[desc.address].remove(orport_match) - - # add the new entry - - self._fingerprint_mappings[desc.address].append((desc.or_port, desc.fingerprint)) - else: - self._fingerprint_mappings[desc.address] = [(desc.or_port, desc.fingerprint)] - - def get_relay_fingerprint(self, relay_address, relay_port = None, get_all_matches = False): + def get_relay_fingerprint(self, address, port = None): """ - Provides the fingerprint associated with the given address. If there's - multiple potential matches or the mapping is unknown then this returns - None. This disambiguates the fingerprint if there's multiple relays on - the same ip address by several methods, one of them being to pick relays - we have a connection with. + Provides the relay running at a given location. If there's multiple relays + and no port is provided to disambiguate then this returns **None**. - Arguments: - relay_address - address of relay to be returned - relay_port - orport of relay (to further narrow the results) - get_all_matches - ignores the relay_port and provides all of the - (port, fingerprint) tuples matching the given - address + :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 """ controller = tor_controller() - # TODO: normalize callers - - if isinstance(relay_port, str): - relay_port = int(relay_port) - - if not controller.is_alive(): - return None - - # checks if this matches us - - if not get_all_matches and relay_address == controller.get_info('address', None): - if not relay_port or relay_port in controller.get_ports(stem.control.Listener.OR, []): + 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) - # populates the ip -> fingerprint mappings if not yet available - - if self._fingerprint_mappings is None: - self._fingerprint_mappings = self._get_fingerprint_mappings() + matches = self._relay_fingerprints().get(address, []) - if get_all_matches: - return self._fingerprint_mappings.get(relay_address, []) - else: - potential_matches = self._fingerprint_mappings.get(relay_address) + 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 - if not potential_matches: - return None # no relay matches this ip address + for match_port, match_fingerprint in matches: + if port == match_port: + return match_fingerprint - if len(potential_matches) == 1: - # There's only one relay belonging to this ip address. If the port - # matches then we're done. + return None - match = potential_matches[0] + def get_all_relay_fingerprints(self, address): + """ + Provides a [(port, fingerprint)...] tuple of all relays on a given address. - if relay_port and match[0] != relay_port: - return None - else: - return match[1] - elif relay_port: - # multiple potential matches, so trying to match based on the port + :param str address: address to be checked - for entry_port, entry_fingerprint in potential_matches: - if entry_port == relay_port: - return entry_fingerprint + :returns: **list** of port/fingerprint tuples running on it + """ - return None + return self._relay_fingerprints().get(address, []) - def get_relay_nickname(self, relay_fingerprint): + def get_relay_nickname(self, fingerprint): """ - Provides the nickname associated with the given relay. This provides None - if no such relay exists, and "Unnamed" if the name hasn't been set. + Provides the nickname associated with the given relay. - Arguments: - relay_fingerprint - fingerprint of the relay + :param str fingerprint: relay to look up + + :reutrns: **str** with the nickname ("Unnamed" if unset), and **None** if + no such relay exists """ - result = None controller = tor_controller() - if controller.is_alive(): - # query the nickname if it isn't yet cached - if relay_fingerprint not in self._nickname_lookup_cache: - if relay_fingerprint == controller.get_info('fingerprint', None): - # this is us, simply check the config - my_nickname = controller.get_conf('Nickname', 'Unnamed') - self._nickname_lookup_cache[relay_fingerprint] = my_nickname - else: - ns_entry = controller.get_network_status(relay_fingerprint, None) - - if ns_entry: - self._nickname_lookup_cache[relay_fingerprint] = ns_entry.nickname - - result = self._nickname_lookup_cache[relay_fingerprint] + if fingerprint not in self._nickname_cache: + if fingerprint == controller.get_info('fingerprint', None): + self._nickname_cache[fingerprint] = controller.get_conf('Nickname', 'Unnamed') + else: + ns_entry = controller.get_network_status(fingerprint, None) - return result + if ns_entry: + self._nickname_cache[fingerprint] = ns_entry.nickname if ns_entry.nickname else 'Unnamed' - def _get_fingerprint_mappings(self, descriptors = None): - """ - Provides IP address to (port, fingerprint) tuple mappings for all of the - currently cached relays. + return self._nickname_cache.get(fingerprint) - Arguments: - descriptors - router status entries (fetched if not provided) + def _relay_fingerprints(self, descriptors = None): """ + Provides a cached mapping of 'address => [(port, fingerprint)...]' for + relays. If not yet available then this retrieves the information. - results = {} - controller = tor_controller() + :param list descriptors: update the cache with these router status entries - if controller.is_alive(): - # fetch the current network status if not provided + :returns: **dict** of addresses to the port/fingerprint tuples running there + """ + if descriptors or self._fingerprint_cache is None: if not descriptors: - try: - descriptors = controller.get_network_statuses() - except stem.ControllerError: - descriptors = [] + descriptors = tor_controller().get_network_statuses([]) - # construct mappings of ips to relay data + results = {} for desc in descriptors: results.setdefault(desc.address, []).append((desc.or_port, desc.fingerprint)) - return results + self._fingerprint_cache = results + + return self._fingerprint_cache

1 0

[nyx/master] Drop is_exiting_allowed() helper
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit d27d79e9be9a48fd15991eb023d6f96082db272a Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 10 09:29:27 2015 -0700 Drop is_exiting_allowed() helper Stem's exit policies do this. The only wrinkle is DNS. We had a hack around this due to funky tor behavior but ticket #965 is now pretty old, so we can probably drop it. --- nyx/connections/conn_entry.py | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index dbfc097..73fe17d 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -440,7 +440,10 @@ class ConnectionLine(entries.ConnectionPanelLine): if destination_fingerprint == 'UNKNOWN': # Not a known relay. This might be an exit connection. - if is_exiting_allowed(controller, self.foreign.get_address(), self.foreign.get_port() if self.foreign.get_port() else None): + exit_policy = controller.get_exit_policy(None) + port = self.foreign.get_port() if self.foreign.get_port() else None + + if exit_policy and exit_policy.can_exit_to(self.foreign.get_address(), port): self.cached_type = Category.EXIT elif self._possible_client or self._possible_directory: # This belongs to a known relay. If we haven't eliminated ourselves as @@ -888,31 +891,6 @@ class ConnectionLine(entries.ConnectionPanelLine): return destination_address[:max_length] -def is_exiting_allowed(controller, ip_address, port): - """ - Checks if the given destination can be exited to by this relay, returning - True if so and False otherwise. - """ - - result = False - - if controller.is_alive(): - # If we allow any exiting then this could be relayed DNS queries, - # otherwise the policy is checked. Tor still makes DNS connections to - # test when exiting isn't allowed, but nothing is relayed over them. - # I'm registering these as non-exiting to avoid likely user confusion: - # https://trac.torproject.org/projects/tor/ticket/965 - - our_policy = controller.get_exit_policy(None) - - if our_policy and our_policy.is_exiting_allowed() and port == '53': - result = True - else: - result = our_policy and our_policy.can_exit_to(ip_address, port) - - return result - - class FingerprintTracker: def __init__(self): # mappings of ip -> [(port, fingerprint), ...]

1 0

[nyx/master] Move initial descriptor fetch to FingerprintTracker constructor
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 6908aa86256d2ea2713392cc86b2944b3c5df25d Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 12 12:05:28 2015 -0700 Move initial descriptor fetch to FingerprintTracker constructor To bootstrap the FingerprintTracker we need to make a 'GETINFO ns/all' request for the router status entries. This is a very costly call (on the order of a second or so), so we need to be wary of when we make it. As such, better for this to be done by our constructor's caller rather than lazy loaded when we need it. This isn't in practice changing anything yet but will make it easier for us to be more careful with this later. Oh, and it makes the class simpler. :P --- nyx/connections/conn_entry.py | 43 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index 4d3b278..cd463be 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -65,7 +65,7 @@ def get_fingerprint_tracker(): global FINGERPRINT_TRACKER if FINGERPRINT_TRACKER is None: - FINGERPRINT_TRACKER = FingerprintTracker() + FINGERPRINT_TRACKER = FingerprintTracker(tor_controller().get_network_statuses([])) return FINGERPRINT_TRACKER @@ -892,15 +892,23 @@ class ConnectionLine(entries.ConnectionPanelLine): class FingerprintTracker: - def __init__(self): - self._fingerprint_cache = None # {address => [(port, fingerprint), ..]} for relays + def __init__(self, router_status_entries): + self._fingerprint_cache = {} # {address => [(port, fingerprint), ..]} for relays self._nickname_cache = {} # fingerprint => nickname lookup cache + for desc in router_status_entries: + self._fingerprint_cache.setdefault(desc.address, []).append((desc.or_port, desc.fingerprint)) + tor_controller().add_event_listener(self._new_consensus_event, stem.control.EventType.NEWCONSENSUS) def _new_consensus_event(self, event): + new_fingerprint_cache = {} + + for desc in event.desc: + new_fingerprint_cache.setdefault(desc.address, []).append((desc.or_port, desc.fingerprint)) + + self._fingerprint_cache = new_fingerprint_cache self._nickname_cache = {} - self._relay_fingerprints(event.desc) def get_relay_fingerprint(self, address, port = None): """ @@ -919,7 +927,7 @@ class FingerprintTracker: if not port or port in controller.get_ports(stem.control.Listener.OR, []): return controller.get_info('fingerprint', None) - matches = self._relay_fingerprints().get(address, []) + matches = self._fingerprint_cache.get(address, []) if len(matches) == 1: match_port, match_fingerprint = matches[0] @@ -942,7 +950,7 @@ class FingerprintTracker: :returns: **list** of port/fingerprint tuples running on it """ - return self._relay_fingerprints().get(address, []) + return self._fingerprint_cache.get(address, []) def get_relay_nickname(self, fingerprint): """ @@ -966,26 +974,3 @@ class FingerprintTracker: self._nickname_cache[fingerprint] = ns_entry.nickname if ns_entry.nickname else 'Unnamed' return self._nickname_cache.get(fingerprint) - - def _relay_fingerprints(self, descriptors = None): - """ - Provides a cached mapping of 'address => [(port, fingerprint)...]' for - relays. If not yet available then this retrieves the information. - - :param list descriptors: update the cache with these router status entries - - :returns: **dict** of addresses to the port/fingerprint tuples running there - """ - - if descriptors or self._fingerprint_cache is None: - if not descriptors: - descriptors = tor_controller().get_network_statuses([]) - - results = {} - - for desc in descriptors: - results.setdefault(desc.address, []).append((desc.or_port, desc.fingerprint)) - - self._fingerprint_cache = results - - return self._fingerprint_cache

1 0

[nyx/master] Drop style checker keywords that no longer exist
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 6ece6bd8939f9d09114fa54c7e17a0c6549f66e9 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 10 09:34:12 2015 -0700 Drop style checker keywords that no longer exist Stem recently dropped these since PEP8 checks now do them. --- run_tests.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/run_tests.py b/run_tests.py index aea9d01..15dd45b 100755 --- a/run_tests.py +++ b/run_tests.py @@ -54,9 +54,7 @@ def main(): if stem.util.test_tools.is_pep8_available(): pep8_issues = stem.util.test_tools.stylistic_issues( SRC_PATHS, - check_two_space_indents = True, check_newlines = True, - check_trailing_whitespace = True, check_exception_keyword = True, prefer_single_quotes = True, )

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2015