tor-commits November 2014

tor-commits@lists.torproject.org

24 participants
954 discussions

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 16 Nov '14

16 Nov '14

commit fda73020b15cb2826f3feda7c78f3e09dc8ad089 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 16 01:45:38 2014 +0000 Update translations for tor-launcher-network-settings_completed --- pt_BR/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/network-settings.dtd b/pt_BR/network-settings.dtd index b78b35c..2b673b5 100644 --- a/pt_BR/network-settings.dtd +++ b/pt_BR/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "Não"> <!ENTITY torSettings.firstQuestion "Quais opções descrevem melhor a sua situação?"> -<!ENTITY torSettings.configurePrompt1 "A conexão internet deste computador encontra-se sob censura ou proxy."> -<!ENTITY torSettings.configurePrompt2 "É preciso configurar bridge ou "> +<!ENTITY torSettings.configurePrompt1 "A conexão Internet deste computador foi censurada, filtrada ou limitada por um proxy."> +<!ENTITY torSettings.configurePrompt2 "Preciso configurar bridge ou configurações de proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connectPrompt2 "Eu gostaria de me conectar diretamente à rede Tor."> <!ENTITY torSettings.connectPrompt3 "Isso funcionará na maioria dos casos.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 16 Nov '14

16 Nov '14

commit cf4ed7db5b5c2b7cf817a64e9084c10a525b5511 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 16 01:45:34 2014 +0000 Update translations for tor-launcher-network-settings --- pt_BR/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/network-settings.dtd b/pt_BR/network-settings.dtd index b78b35c..2b673b5 100644 --- a/pt_BR/network-settings.dtd +++ b/pt_BR/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "Não"> <!ENTITY torSettings.firstQuestion "Quais opções descrevem melhor a sua situação?"> -<!ENTITY torSettings.configurePrompt1 "A conexão internet deste computador encontra-se sob censura ou proxy."> -<!ENTITY torSettings.configurePrompt2 "É preciso configurar bridge ou "> +<!ENTITY torSettings.configurePrompt1 "A conexão Internet deste computador foi censurada, filtrada ou limitada por um proxy."> +<!ENTITY torSettings.configurePrompt2 "Preciso configurar bridge ou configurações de proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connectPrompt2 "Eu gostaria de me conectar diretamente à rede Tor."> <!ENTITY torSettings.connectPrompt3 "Isso funcionará na maioria dos casos.">

1 0

[arm/master] Rewriting prepopulate_from_state()
by atagar＠torproject.org 16 Nov '14

16 Nov '14

commit a3beb2e196980af0e69a5b4aec9e9909b4c63283 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 15 17:04:28 2014 -0800 Rewriting prepopulate_from_state() Moving the function into the BandwidthStats class, and rewriting it to be both more succinct and less wrong. Few obvious issues... --- arm/graph_panel.py | 85 +++++++++++++++++-------------------- arm/util/__init__.py | 6 +-- test/util/bandwidth_from_state.py | 4 +- 3 files changed, 45 insertions(+), 50 deletions(-) diff --git a/arm/graph_panel.py b/arm/graph_panel.py index 612cbf2..af6751e 100644 --- a/arm/graph_panel.py +++ b/arm/graph_panel.py @@ -160,8 +160,6 @@ class GraphCategory(object): self.primary_header_stats = [] self.secondary_header_stats = [] - tor_controller().add_event_listener(self.bandwidth_event, EventType.BW) - def y_axis_label(self, value, is_primary): """ Provides the label we should display on our y-axis. @@ -262,6 +260,39 @@ class BandwidthStats(GraphCategory): self.title_stats = stats + def prepopulate_from_state(self): + """ + Attempts to use tor's state file to prepopulate values for the 15 minute + interval via the BWHistoryReadValues/BWHistoryWriteValues values. + + :returns: **float** for the number of seconds of data missing + + :raises: **ValueError** if unable to get the bandwidth information from our + state file + """ + + def update_values(stat, entries, latest_time): + # fill missing entries with the last value + + missing_entries = int((time.time() - latest_time) / 900) + entries = entries + [entries[-1]] * missing_entries + + # pad if too short and truncate if too long + + entry_count = CONFIG['features.graph.max_width'] + entries = [0] * (entry_count - len(entries)) + entries[-entry_count:] + + stat.values[Interval.FIFTEEN_MINUTE] = entries + stat.max_value[Interval.FIFTEEN_MINUTE] = max(entries) + stat.latest_value = entries[-1] * 900 + + stats = bandwidth_from_state() + + update_values(self.primary, stats.read_entries, stats.last_read_time) + update_values(self.secondary, stats.write_entries, stats.last_write_time) + + return time.time() - min(stats.last_read_time, stats.last_write_time) + def _size_label(self, byte_count, decimal = 1): """ Alias for str_tools.size_label() that accounts for if the user prefers bits @@ -348,23 +379,26 @@ class GraphPanel(panel.Panel): controller = tor_controller() - if CONFIG['features.graph.bw.prepopulate'] and controller.is_alive(): + if controller.is_alive() and CONFIG['features.graph.bw.prepopulate']: try: - missing_seconds = prepopulate_from_state(self.stats[GraphStat.BANDWIDTH]) + missing_seconds = self.stats[GraphStat.BANDWIDTH].prepopulate_from_state() if missing_seconds: log.notice(msg('panel.graphing.prepopulation_successful', duration = str_tools.time_label(missing_seconds, 0, True))) else: log.notice(msg('panel.graphing.prepopulation_all_successful')) - self.update_interval = '15 minute' + self.update_interval = Interval.FIFTEEN_MINUTE except ValueError as exc: - log.info(msg('panel.graphing.prepopulation_failure', error = str(exc))) + log.info(msg('panel.graphing.prepopulation_failure', error = exc)) controller.add_event_listener(self.bandwidth_event, EventType.BW) controller.add_status_listener(self.reset_listener) def bandwidth_event(self, event): + for stat in self.stats.values(): + stat.bandwidth_event(event) + if not CONFIG['features.graph.bw.accounting.show']: self._accounting_stats = None elif not self._accounting_stats or time.time() - self._accounting_stats.retrieved >= ACCOUNTING_RATE: @@ -723,42 +757,3 @@ class GraphPanel(panel.Panel): return dict([(key, type(self.stats[key])(self.stats[key])) for key in self.stats]) else: return panel.Panel.copy_attr(self, attr) - - -def prepopulate_from_state(stat): - """ - Attempts to use tor's state file to prepopulate values for the 15 minute - interval via the BWHistoryReadValues/BWHistoryWriteValues values. This - returns True if successful and False otherwise. - """ - - stats = bandwidth_from_state() - - missing_read_entries = int((time.time() - stats.last_read_time) / 900) - missing_write_entries = int((time.time() - stats.last_write_time) / 900) - - # fills missing entries with the last value - - bw_read_entries = stats.read_entries + [stats.read_entries[-1]] * missing_read_entries - bw_write_entries = stats.write_entries + [stats.write_entries[-1]] * missing_write_entries - - # crops starting entries so they're the same size - - entry_count = min(len(bw_read_entries), len(bw_write_entries), CONFIG['features.graph.max_width']) - bw_read_entries = bw_read_entries[len(bw_read_entries) - entry_count:] - bw_write_entries = bw_write_entries[len(bw_write_entries) - entry_count:] - - # fills the graphing parameters with state information - - for i in range(entry_count): - read_value, write_value = bw_read_entries[i] * 1024, bw_write_entries[i] * 1024 # KB => B - - stat.primary.latest_value, stat.secondary.latest_value = read_value / 900, write_value / 900 - - stat.primary.values['15 minute'] = [read_value] + stat.primary.values['15 minute'][:-1] - stat.secondary.values['15 minute'] = [write_value] + stat.secondary.values['15 minute'][:-1] - - stat.primary.max_value['15 minute'] = max(stat.primary.values) - stat.secondary.max_value['15 minute'] = max(stat.secondary.values) - - return time.time() - min(stats.last_read_time, stats.last_write_time) diff --git a/arm/util/__init__.py b/arm/util/__init__.py index c410284..9546642 100644 --- a/arm/util/__init__.py +++ b/arm/util/__init__.py @@ -92,7 +92,7 @@ def bandwidth_from_state(config): * read_entries and write_entries - List of the average kilobytes read or written during each fifteen minute + List of the average bytes read or written during each fifteen minute period, oldest to newest. * last_read_time and last_write_time @@ -151,9 +151,9 @@ def bandwidth_from_state(config): line = line.strip() if line.startswith('BWHistoryReadValues '): - attr['read_entries'] = [int(entry) / 1024.0 / 900 for entry in line[20:].split(',')[:-1]] + attr['read_entries'] = [int(entry) / 900 for entry in line[20:].split(',')[:-1]] elif line.startswith('BWHistoryWriteValues '): - attr['write_entries'] = [int(entry) / 1024.0 / 900 for entry in line[21:].split(',')[:-1]] + attr['write_entries'] = [int(entry) / 900 for entry in line[21:].split(',')[:-1]] elif line.startswith('BWHistoryReadEnds '): attr['last_read_time'] = calendar.timegm(time.strptime(line[18:], '%Y-%m-%d %H:%M:%S')) - 900 elif line.startswith('BWHistoryWriteEnds '): diff --git a/test/util/bandwidth_from_state.py b/test/util/bandwidth_from_state.py index b84c251..6877371 100644 --- a/test/util/bandwidth_from_state.py +++ b/test/util/bandwidth_from_state.py @@ -105,7 +105,7 @@ class TestBandwidthFromState(unittest.TestCase): open_mock.return_value = io.BytesIO(STATE_FILE_WITH_ENTRIES % (timestamp, timestamp)) stats = bandwidth_from_state() - self.assertEqual([1, 2, 3, 4], stats.read_entries) - self.assertEqual([50, 50, 100, 100], stats.write_entries) + self.assertEqual([1024, 2048, 3072, 4096], stats.read_entries) + self.assertEqual([51200, 51200, 102400, 102400], stats.write_entries) self.assertEqual(now, stats.last_read_time) self.assertEqual(now, stats.last_write_time)

1 0

[arm/master] Making the _size_label() helper a BandwidthStats method
by atagar＠torproject.org 16 Nov '14

16 Nov '14

commit 4a4d961792c04199c70c7a81b86d11f66939618f Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 15 13:09:05 2014 -0800 Making the _size_label() helper a BandwidthStats method This alias only applies to bandwidth traffic. As such making it part of the BandwidthStats. --- arm/graph_panel.py | 54 +++++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/arm/graph_panel.py b/arm/graph_panel.py index 0210b2e..612cbf2 100644 --- a/arm/graph_panel.py +++ b/arm/graph_panel.py @@ -15,15 +15,13 @@ import copy import curses import time -import arm.popups import arm.controller +import arm.popups import arm.util.tracker -import stem.control - from arm.util import bandwidth_from_state, msg, panel, tor_controller -from stem.control import Listener +from stem.control import EventType, Listener from stem.util import conf, enum, log, str_tools, system GraphStat = enum.Enum(('BANDWIDTH', 'bandwidth'), ('CONNECTIONS', 'connections'), ('SYSTEM_RESOURCES', 'resources')) @@ -117,8 +115,8 @@ class Stat(object): self.max_value = dict([(i, 0) for i in Interval]) self._in_process_value = dict([(i, 0) for i in Interval]) - def average(self): - return self.total / max(1, self.tick) + def average(self, by_time = False): + return self.total / (time.time() - self.start_time) if by_time else self.total / max(1, self.tick) def update(self, new_value): self.latest_value = new_value @@ -162,7 +160,7 @@ class GraphCategory(object): self.primary_header_stats = [] self.secondary_header_stats = [] - tor_controller().add_event_listener(self.bandwidth_event, stem.control.EventType.BW) + tor_controller().add_event_listener(self.bandwidth_event, EventType.BW) def y_axis_label(self, value, is_primary): """ @@ -213,33 +211,33 @@ class BandwidthStats(GraphCategory): self.primary.start_time = self.secondary.start_time = start_time def y_axis_label(self, value, is_primary): - return str_tools.size_label(value, is_bytes = CONFIG['features.graph.bw.transferInBytes']) + return self._size_label(value, 0) def bandwidth_event(self, event): self.primary.update(event.read) self.secondary.update(event.written) self.primary_header_stats = [ - '%-14s' % ('%s/sec' % _size_label(self.primary.latest_value)), - '- avg: %s/sec' % _size_label(self.primary.total / (time.time() - self.primary.start_time)), - ', total: %s' % _size_label(self.primary.total), + '%-14s' % ('%s/sec' % self._size_label(self.primary.latest_value)), + '- avg: %s/sec' % self._size_label(self.primary.average(by_time = True)), + ', total: %s' % self._size_label(self.primary.total), ] self.secondary_header_stats = [ - '%-14s' % ('%s/sec' % _size_label(self.secondary.latest_value)), - '- avg: %s/sec' % _size_label(self.secondary.total / (time.time() - self.secondary.start_time)), - ', total: %s' % _size_label(self.secondary.total), + '%-14s' % ('%s/sec' % self._size_label(self.secondary.latest_value)), + '- avg: %s/sec' % self._size_label(self.secondary.average(by_time = True)), + ', total: %s' % self._size_label(self.secondary.total), ] - stats = [] controller = tor_controller() + stats = [] bw_rate = controller.get_effective_rate(None) bw_burst = controller.get_effective_rate(None, burst = True) if bw_rate and bw_burst: - bw_rate_label = _size_label(bw_rate) - bw_burst_label = _size_label(bw_burst) + bw_rate_label = self._size_label(bw_rate) + bw_burst_label = self._size_label(bw_burst) # if both are using rounded values then strip off the '.0' decimal @@ -254,16 +252,24 @@ class BandwidthStats(GraphCategory): measured_bw = getattr(my_router_status_entry, 'bandwidth', None) if measured_bw: - stats.append('measured: %s/s' % _size_label(measured_bw)) + stats.append('measured: %s/s' % self._size_label(measured_bw)) else: my_server_descriptor = controller.get_server_descriptor(default = None) observed_bw = getattr(my_server_descriptor, 'observed_bandwidth', None) if observed_bw: - stats.append('observed: %s/s' % _size_label(observed_bw)) + stats.append('observed: %s/s' % self._size_label(observed_bw)) self.title_stats = stats + def _size_label(self, byte_count, decimal = 1): + """ + Alias for str_tools.size_label() that accounts for if the user prefers bits + or bytes. + """ + + return str_tools.size_label(byte_count, decimal, is_bytes = CONFIG['features.graph.bw.transferInBytes']) + class ConnectionStats(GraphCategory): """ @@ -355,7 +361,7 @@ class GraphPanel(panel.Panel): except ValueError as exc: log.info(msg('panel.graphing.prepopulation_failure', error = str(exc))) - controller.add_event_listener(self.bandwidth_event, stem.control.EventType.BW) + controller.add_event_listener(self.bandwidth_event, EventType.BW) controller.add_status_listener(self.reset_listener) def bandwidth_event(self, event): @@ -665,8 +671,8 @@ class GraphPanel(panel.Panel): graph_column = min((width - 10) / 2, CONFIG['features.graph.max_width']) runtime = time.time() - param.start_time - primary_footer = 'total: %s, avg: %s/sec' % (_size_label(param.primary.total * 1024), _size_label(param.primary.total / runtime * 1024)) - secondary_footer = 'total: %s, avg: %s/sec' % (_size_label(param.secondary.total * 1024), _size_label(param.secondary.total / runtime * 1024)) + primary_footer = 'total: %s, avg: %s/sec' % (param._size_label(param.primary.total), param._size_label(param.primary.total / runtime)) + secondary_footer = 'total: %s, avg: %s/sec' % (param._size_label(param.secondary.total), param._size_label(param.secondary.total / runtime)) self.addstr(labeling_line, 1, primary_footer, PRIMARY_COLOR) self.addstr(labeling_line, graph_column + 6, secondary_footer, SECONDARY_COLOR) @@ -719,10 +725,6 @@ class GraphPanel(panel.Panel): return panel.Panel.copy_attr(self, attr) -def _size_label(byte_count): - return str_tools.size_label(byte_count, 1, is_bytes = CONFIG['features.graph.bw.transferInBytes']) - - def prepopulate_from_state(stat): """ Attempts to use tor's state file to prepopulate values for the 15 minute

1 0

[arm/master] Marking GraphPanel attributes as private
by atagar＠torproject.org 16 Nov '14

16 Nov '14

commit b764fb7e446677c0b56a2c31e6d83077ed4f7b4c Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 15 17:29:17 2014 -0800 Marking GraphPanel attributes as private We already had getters and setters for them (since they're customized via the menu), so mostly just renaming. --- arm/graph_panel.py | 141 ++++++++++++++++++++++++++------------------------- arm/menu/actions.py | 2 +- 2 files changed, 73 insertions(+), 70 deletions(-) diff --git a/arm/graph_panel.py b/arm/graph_panel.py index af6751e..60006db 100644 --- a/arm/graph_panel.py +++ b/arm/graph_panel.py @@ -356,23 +356,23 @@ class GraphPanel(panel.Panel): def __init__(self, stdscr): panel.Panel.__init__(self, stdscr, 'graph', 0) - self.current_display = None if CONFIG['features.graph.type'] == 'none' else CONFIG['features.graph.type'] - self.update_interval = CONFIG['features.graph.interval'] - self.bounds = CONFIG['features.graph.bound'] + self._current_display = None if CONFIG['features.graph.type'] == 'none' else CONFIG['features.graph.type'] + self._update_interval = CONFIG['features.graph.interval'] + self._bounds = CONFIG['features.graph.bound'] - self.graph_height = max(1, CONFIG['features.graph.height']) + self._graph_height = max(1, CONFIG['features.graph.height']) self._accounting_stats = None self._last_redraw = 0 - self.stats = { + self._stats = { GraphStat.BANDWIDTH: BandwidthStats(), GraphStat.SYSTEM_RESOURCES: ResourceStats(), } if CONFIG['features.panels.show.connection']: - self.stats[GraphStat.CONNECTIONS] = ConnectionStats() + self._stats[GraphStat.CONNECTIONS] = ConnectionStats() - self.set_pause_attr('stats') + self.set_pause_attr('_stats') self.set_pause_attr('_accounting_stats') # prepopulates bandwidth values from state file @@ -381,14 +381,14 @@ class GraphPanel(panel.Panel): if controller.is_alive() and CONFIG['features.graph.bw.prepopulate']: try: - missing_seconds = self.stats[GraphStat.BANDWIDTH].prepopulate_from_state() + missing_seconds = self._stats[GraphStat.BANDWIDTH].prepopulate_from_state() if missing_seconds: log.notice(msg('panel.graphing.prepopulation_successful', duration = str_tools.time_label(missing_seconds, 0, True))) else: log.notice(msg('panel.graphing.prepopulation_all_successful')) - self.update_interval = Interval.FIFTEEN_MINUTE + self._update_interval = Interval.FIFTEEN_MINUTE except ValueError as exc: log.info(msg('panel.graphing.prepopulation_failure', error = exc)) @@ -396,7 +396,7 @@ class GraphPanel(panel.Panel): controller.add_status_listener(self.reset_listener) def bandwidth_event(self, event): - for stat in self.stats.values(): + for stat in self._stats.values(): stat.bandwidth_event(event) if not CONFIG['features.graph.bw.accounting.show']: @@ -410,7 +410,7 @@ class GraphPanel(panel.Panel): arm.controller.get_controller().redraw() - update_rate = INTERVAL_SECONDS[self.update_interval] + update_rate = INTERVAL_SECONDS[self._update_interval] if time.time() - self._last_redraw > update_rate: self.redraw(True) @@ -423,7 +423,7 @@ class GraphPanel(panel.Panel): Provides the rate that we update the graph at. """ - return self.update_interval + return self._update_interval def set_update_interval(self, update_interval): """ @@ -433,14 +433,14 @@ class GraphPanel(panel.Panel): update_interval - update time enum """ - self.update_interval = update_interval + self._update_interval = update_interval def get_bounds_type(self): """ Provides the type of graph bounds used. """ - return self.bounds + return self._bounds def set_bounds_type(self, bounds_type): """ @@ -450,7 +450,7 @@ class GraphPanel(panel.Panel): bounds_type - graph bounds enum """ - self.bounds = bounds_type + self._bounds = bounds_type def get_height(self): """ @@ -458,12 +458,12 @@ class GraphPanel(panel.Panel): (zero if hidden). """ - if self.current_display: - height = DEFAULT_CONTENT_HEIGHT + self.graph_height + if self._current_display: + height = DEFAULT_CONTENT_HEIGHT + self._graph_height else: height = 0 - if self.current_display == GraphStat.BANDWIDTH and self._accounting_stats: + if self._current_display == GraphStat.BANDWIDTH and self._accounting_stats: height += 3 return height @@ -476,7 +476,7 @@ class GraphPanel(panel.Panel): new_graph_height - new height for the graph """ - self.graph_height = max(1, new_graph_height) + self._graph_height = max(1, new_graph_height) def resize_graph(self): """ @@ -504,9 +504,9 @@ class GraphPanel(panel.Panel): current_height = self.get_height() if current_height < max_height + 1: - self.set_graph_height(self.graph_height + 1) + self.set_graph_height(self._graph_height + 1) elif key.match('up'): - self.set_graph_height(self.graph_height - 1) + self.set_graph_height(self._graph_height - 1) elif key.is_selection(): break @@ -519,12 +519,12 @@ class GraphPanel(panel.Panel): self.resize_graph() elif key.match('b'): # uses the next boundary type - self.bounds = Bounds.next(self.bounds) + self._bounds = Bounds.next(self._bounds) self.redraw(True) elif key.match('s'): # provides a menu to pick the graphed stats - available_stats = self.stats.keys() + available_stats = self._stats.keys() available_stats.sort() # uses sorted, camel cased labels for the options @@ -535,8 +535,8 @@ class GraphPanel(panel.Panel): words = label.split() options.append(' '.join(word[0].upper() + word[1:] for word in words)) - if self.current_display: - initial_selection = available_stats.index(self.current_display) + 1 + if self._current_display: + initial_selection = available_stats.index(self._current_display) + 1 else: initial_selection = 0 @@ -551,10 +551,10 @@ class GraphPanel(panel.Panel): elif key.match('i'): # provides menu to pick graph panel update interval - selection = arm.popups.show_menu('Update Interval:', list(Interval), list(Interval).index(self.update_interval)) + selection = arm.popups.show_menu('Update Interval:', list(Interval), list(Interval).index(self._update_interval)) if selection != -1: - self.update_interval = list(Interval)[selection] + self._update_interval = list(Interval)[selection] else: return False @@ -563,57 +563,57 @@ class GraphPanel(panel.Panel): def get_help(self): return [ ('r', 'resize graph', None), - ('s', 'graphed stats', self.current_display if self.current_display else 'none'), - ('b', 'graph bounds', self.bounds.lower()), - ('i', 'graph update interval', self.update_interval), + ('s', 'graphed stats', self._current_display if self._current_display else 'none'), + ('b', 'graph bounds', self._bounds.lower()), + ('i', 'graph update interval', self._update_interval), ] def draw(self, width, height): - if not self.current_display: + if not self._current_display: return self._last_redraw = time.time() - param = self.get_attr('stats')[self.current_display] + param = self.get_attr('_stats')[self._current_display] graph_column = min((width - 10) / 2, CONFIG['features.graph.max_width']) if self.is_title_visible(): - title = CONFIG['attr.graph.title'].get(self.current_display, '') + title = CONFIG['attr.graph.title'].get(self._current_display, '') title_stats = str_tools.join(param.title_stats, ', ', width - len(title) - 4) title = '%s (%s):' % (title, title_stats) if title_stats else '%s:' % title self.addstr(0, 0, title, curses.A_STANDOUT) # top labels - primary_header = CONFIG['attr.graph.header.primary'].get(self.current_display, '') + primary_header = CONFIG['attr.graph.header.primary'].get(self._current_display, '') primary_header_stats = str_tools.join(param.primary_header_stats, '', (width / 2) - len(primary_header) - 4) left = '%s (%s):' % (primary_header, primary_header_stats) if primary_header_stats else '%s:' % primary_header self.addstr(1, 0, left, curses.A_BOLD, PRIMARY_COLOR) - secondary_header = CONFIG['attr.graph.header.secondary'].get(self.current_display, '') + secondary_header = CONFIG['attr.graph.header.secondary'].get(self._current_display, '') secondary_header_stats = str_tools.join(param.secondary_header_stats, '', (width / 2) - len(secondary_header) - 4) right = '%s (%s):' % (secondary_header, secondary_header_stats) if secondary_header_stats else '%s:' % secondary_header self.addstr(1, graph_column + 5, right, curses.A_BOLD, SECONDARY_COLOR) # determines max/min value on the graph - if self.bounds == Bounds.GLOBAL_MAX: - primary_max_bound = param.primary.max_value[self.update_interval] - secondary_max_bound = param.secondary.max_value[self.update_interval] + if self._bounds == Bounds.GLOBAL_MAX: + primary_max_bound = param.primary.max_value[self._update_interval] + secondary_max_bound = param.secondary.max_value[self._update_interval] else: # both Bounds.LOCAL_MAX and Bounds.TIGHT use local maxima if graph_column < 2: # nothing being displayed primary_max_bound, secondary_max_bound = 0, 0 else: - primary_max_bound = max(param.primary.values[self.update_interval][:graph_column]) - secondary_max_bound = max(param.secondary.values[self.update_interval][:graph_column]) + primary_max_bound = max(param.primary.values[self._update_interval][:graph_column]) + secondary_max_bound = max(param.secondary.values[self._update_interval][:graph_column]) primary_min_bound = secondary_min_bound = 0 - if self.bounds == Bounds.TIGHT: - primary_min_bound = min(param.primary.values[self.update_interval][:graph_column]) - secondary_min_bound = min(param.secondary.values[self.update_interval][:graph_column]) + if self._bounds == Bounds.TIGHT: + primary_min_bound = min(param.primary.values[self._update_interval][:graph_column]) + secondary_min_bound = min(param.secondary.values[self._update_interval][:graph_column]) # if the max = min (ie, all values are the same) then use zero lower # bound so a graph is still displayed @@ -627,30 +627,30 @@ class GraphPanel(panel.Panel): # displays upper and lower bounds self.addstr(2, 0, param.y_axis_label(primary_max_bound, True), PRIMARY_COLOR) - self.addstr(self.graph_height + 1, 0, param.y_axis_label(primary_min_bound, True), PRIMARY_COLOR) + self.addstr(self._graph_height + 1, 0, param.y_axis_label(primary_min_bound, True), PRIMARY_COLOR) self.addstr(2, graph_column + 5, param.y_axis_label(secondary_max_bound, False), SECONDARY_COLOR) - self.addstr(self.graph_height + 1, graph_column + 5, param.y_axis_label(secondary_min_bound, False), SECONDARY_COLOR) + self.addstr(self._graph_height + 1, graph_column + 5, param.y_axis_label(secondary_min_bound, False), SECONDARY_COLOR) # displays intermediate bounds on every other row if CONFIG['features.graph.showIntermediateBounds']: - ticks = (self.graph_height - 3) / 2 + ticks = (self._graph_height - 3) / 2 for i in range(ticks): - row = self.graph_height - (2 * i) - 3 + row = self._graph_height - (2 * i) - 3 - if self.graph_height % 2 == 0 and i >= (ticks / 2): + if self._graph_height % 2 == 0 and i >= (ticks / 2): row -= 1 if primary_min_bound != primary_max_bound: - primary_val = (primary_max_bound - primary_min_bound) * (self.graph_height - row - 1) / (self.graph_height - 1) + primary_val = (primary_max_bound - primary_min_bound) * (self._graph_height - row - 1) / (self._graph_height - 1) if primary_val not in (primary_min_bound, primary_max_bound): self.addstr(row + 2, 0, param.y_axis_label(primary_val, True), PRIMARY_COLOR) if secondary_min_bound != secondary_max_bound: - secondary_val = (secondary_max_bound - secondary_min_bound) * (self.graph_height - row - 1) / (self.graph_height - 1) + secondary_val = (secondary_max_bound - secondary_min_bound) * (self._graph_height - row - 1) / (self._graph_height - 1) if secondary_val not in (secondary_min_bound, secondary_max_bound): self.addstr(row + 2, graph_column + 5, param.y_axis_label(secondary_val, False), SECONDARY_COLOR) @@ -658,21 +658,21 @@ class GraphPanel(panel.Panel): # creates bar graph (both primary and secondary) for col in range(graph_column): - column_count = int(param.primary.values[self.update_interval][col]) - primary_min_bound - column_height = int(min(self.graph_height, self.graph_height * column_count / (max(1, primary_max_bound) - primary_min_bound))) + column_count = int(param.primary.values[self._update_interval][col]) - primary_min_bound + column_height = int(min(self._graph_height, self._graph_height * column_count / (max(1, primary_max_bound) - primary_min_bound))) for row in range(column_height): - self.addstr(self.graph_height + 1 - row, col + 5, ' ', curses.A_STANDOUT, PRIMARY_COLOR) + self.addstr(self._graph_height + 1 - row, col + 5, ' ', curses.A_STANDOUT, PRIMARY_COLOR) - column_count = int(param.secondary.values[self.update_interval][col]) - secondary_min_bound - column_height = int(min(self.graph_height, self.graph_height * column_count / (max(1, secondary_max_bound) - secondary_min_bound))) + column_count = int(param.secondary.values[self._update_interval][col]) - secondary_min_bound + column_height = int(min(self._graph_height, self._graph_height * column_count / (max(1, secondary_max_bound) - secondary_min_bound))) for row in range(column_height): - self.addstr(self.graph_height + 1 - row, col + graph_column + 10, ' ', curses.A_STANDOUT, SECONDARY_COLOR) + self.addstr(self._graph_height + 1 - row, col + graph_column + 10, ' ', curses.A_STANDOUT, SECONDARY_COLOR) # bottom labeling of x-axis - interval_sec = INTERVAL_SECONDS[self.update_interval] + interval_sec = INTERVAL_SECONDS[self._update_interval] interval_spacing = 10 if graph_column >= WIDE_LABELING_GRAPH_COL else 5 units_label, decimal_precision = None, 0 @@ -691,14 +691,14 @@ class GraphPanel(panel.Panel): # if constrained on space then strips labeling since already provided time_label = time_label[:-1] - self.addstr(self.graph_height + 2, 4 + loc, time_label, PRIMARY_COLOR) - self.addstr(self.graph_height + 2, graph_column + 10 + loc, time_label, SECONDARY_COLOR) + self.addstr(self._graph_height + 2, 4 + loc, time_label, PRIMARY_COLOR) + self.addstr(self._graph_height + 2, graph_column + 10 + loc, time_label, SECONDARY_COLOR) # if display is narrow, overwrites x-axis labels with avg / total stats - labeling_line = DEFAULT_CONTENT_HEIGHT + self.graph_height - 2 + labeling_line = DEFAULT_CONTENT_HEIGHT + self._graph_height - 2 - if self.current_display == GraphStat.BANDWIDTH and width <= COLLAPSE_WIDTH: + if self._current_display == GraphStat.BANDWIDTH and width <= COLLAPSE_WIDTH: # clears line self.addstr(labeling_line, 0, ' ' * width) @@ -715,7 +715,7 @@ class GraphPanel(panel.Panel): accounting_stats = self.get_attr('_accounting_stats') - if self.current_display == GraphStat.BANDWIDTH and accounting_stats: + if self._current_display == GraphStat.BANDWIDTH and accounting_stats: if tor_controller().is_alive(): hibernate_color = CONFIG['attr.hibernate_color'].get(accounting_stats.status, 'red') @@ -737,23 +737,26 @@ class GraphPanel(panel.Panel): Provides the currently selected stats label. """ - return self.current_display + return self._current_display def set_stats(self, label): """ Sets the currently displayed stats instance, hiding panel if None. """ - if label != self.current_display: + if label != self._current_display: if not label: - self.current_display = None - elif label in self.stats.keys(): - self.current_display = label + self._current_display = None + elif label in self._stats.keys(): + self._current_display = label else: raise ValueError('Unrecognized stats label: %s' % label) + def get_all_stats(self): + return self._stats + def copy_attr(self, attr): - if attr == 'stats': - return dict([(key, type(self.stats[key])(self.stats[key])) for key in self.stats]) + if attr == '_stats': + return dict([(key, type(self._stats[key])(self._stats[key])) for key in self._stats]) else: return panel.Panel.copy_attr(self, attr) diff --git a/arm/menu/actions.py b/arm/menu/actions.py index 3f70e66..5608d6b 100644 --- a/arm/menu/actions.py +++ b/arm/menu/actions.py @@ -150,7 +150,7 @@ def make_graph_menu(graph_panel): # stats options stat_group = arm.menu.item.SelectionGroup(graph_panel.set_stats, graph_panel.get_stats()) - available_stats = graph_panel.stats.keys() + available_stats = graph_panel.get_all_stats().keys() available_stats.sort() for stat_key in ["None"] + available_stats:

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 15 Nov '14

15 Nov '14

commit da2356e09e699cd2b2490d253213ecbec98c9b4f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 15 23:45:40 2014 +0000 Update translations for tails-misc_completed --- nb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nb.po b/nb.po index 33ae699..bcb94ee 100644 --- a/nb.po +++ b/nb.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 17:57+0200\n" -"PO-Revision-Date: 2014-11-15 12:01+0000\n" +"PO-Revision-Date: 2014-11-15 23:30+0000\n" "Last-Translator: David Gutierrez <david.gutierrez.abreu(a)gmail.com>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -508,7 +508,7 @@ msgstr "Start datamaskinen på nytt øyeblikkelig" #: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1 msgid "Power Off" -msgstr "Slå Av" +msgstr "Slå av" #: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:2 msgid "Immediately shut down computer" @@ -516,7 +516,7 @@ msgstr "Skru av datamaskinen øyeblikkelig" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1 msgid "Tor Browser" -msgstr "Tor Browser" +msgstr "Tor Nettleser" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2 msgid "Anonymous Web Browser"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 15 Nov '14

15 Nov '14

commit 42c50514b17f9811fc15f3669309b859fe8f2135 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 15 23:45:35 2014 +0000 Update translations for tails-misc --- nb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nb.po b/nb.po index 33ae699..bcb94ee 100644 --- a/nb.po +++ b/nb.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 17:57+0200\n" -"PO-Revision-Date: 2014-11-15 12:01+0000\n" +"PO-Revision-Date: 2014-11-15 23:30+0000\n" "Last-Translator: David Gutierrez <david.gutierrez.abreu(a)gmail.com>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -508,7 +508,7 @@ msgstr "Start datamaskinen på nytt øyeblikkelig" #: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1 msgid "Power Off" -msgstr "Slå Av" +msgstr "Slå av" #: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:2 msgid "Immediately shut down computer" @@ -516,7 +516,7 @@ msgstr "Skru av datamaskinen øyeblikkelig" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1 msgid "Tor Browser" -msgstr "Tor Browser" +msgstr "Tor Nettleser" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2 msgid "Anonymous Web Browser"

1 0

[stem/master] Adding constraints for new consensus parameters
by atagar＠torproject.org 15 Nov '14

15 Nov '14

commit 3b0f736c899e741721f3c9667d98a34f1cc04c5c Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 15 12:22:05 2014 -0800 Adding constraints for new consensus parameters Checking the constraints of new tor consensus parameters... https://gitweb.torproject.org/torspec.git/commitdiff/2ad7829 --- stem/descriptor/networkstatus.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index c861236..1e516d3 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -836,6 +836,20 @@ class _DocumentHeader(object): minimum, maximum = 0, 1 elif key == 'usecreatefast': minimum, maximum = 0, 1 + elif key == 'UseNTorHandshake': + minimum, maximum = 0, 1 + elif key == 'FastFlagMinThreshold': + minimum = 4 + elif key == 'NumDirectoryGuards': + minimum, maximum = 0, 10 + elif key == 'NumEntryGuards': + minimum, maximum = 1, 10 + elif key == 'GuardLifetime': + minimum, maximum = 2592000, 157766400 # min: 30 days, max: 1826 days + elif key == 'NumNTorsPerTAP': + minimum, maximum = 1, 100000 + elif key == 'AllowNonearlyExtend': + minimum, maximum = 0, 1 if value < minimum or value > maximum: raise ValueError("'%s' value on the params line must be in the range of %i - %i, was %i" % (key, minimum, maximum, value))

1 0

[onionoo/master] Accept base64-encoded fingerprints in search parameter.
by karsten＠torproject.org 15 Nov '14

15 Nov '14

commit fe9afb2721e87f08e895b70b72109cbbc253118b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Oct 3 14:38:30 2014 +0200 Accept base64-encoded fingerprints in search parameter. Implements #13135. --- .../torproject/onionoo/docs/SummaryDocument.java | 24 +++++++++-- .../torproject/onionoo/server/RequestHandler.java | 6 +++ .../torproject/onionoo/server/ResourceServlet.java | 3 +- .../torproject/onionoo/server/ResponseBuilder.java | 4 +- .../torproject/onionoo/ResourceServletTest.java | 45 ++++++++++++++++++++ web/protocol.html | 18 ++++---- 6 files changed, 85 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java b/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java index 8645950..8e325f3 100644 --- a/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java +++ b/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java @@ -11,6 +11,7 @@ import java.util.TreeSet; import java.util.regex.Pattern; import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.digest.DigestUtils; @@ -34,22 +35,37 @@ public class SummaryDocument extends Document { } } this.f = fingerprint; + this.hashedFingerprint = null; + this.base64Fingerprint = null; } public String getFingerprint() { return this.f; } + private transient String hashedFingerprint = null; public String getHashedFingerprint() { - String hashedFingerprint = null; - if (this.f != null) { + if (this.hashedFingerprint == null && this.f != null) { try { - hashedFingerprint = DigestUtils.shaHex(Hex.decodeHex( + this.hashedFingerprint = DigestUtils.shaHex(Hex.decodeHex( this.f.toCharArray())).toUpperCase(); } catch (DecoderException e) { /* Format tested in setFingerprint(). */ } } - return hashedFingerprint; + return this.hashedFingerprint; + } + + private transient String base64Fingerprint = null; + public String getBase64Fingerprint() { + if (this.base64Fingerprint == null && this.f != null) { + try { + this.base64Fingerprint = Base64.encodeBase64String(Hex.decodeHex( + this.f.toCharArray())).replaceAll("=", ""); + } catch (DecoderException e) { + /* Format tested in setFingerprint(). */ + } + } + return this.base64Fingerprint; } private String n; diff --git a/src/main/java/org/torproject/onionoo/server/RequestHandler.java b/src/main/java/org/torproject/onionoo/server/RequestHandler.java index 79987fb..28b5531 100644 --- a/src/main/java/org/torproject/onionoo/server/RequestHandler.java +++ b/src/main/java/org/torproject/onionoo/server/RequestHandler.java @@ -204,6 +204,8 @@ public class RequestHandler { filteredRelays.entrySet()) { String fingerprint = e.getKey(); SummaryDocument entry = e.getValue(); + String base64Fingerprint = entry.isRelay() ? + entry.getBase64Fingerprint() : null; boolean lineMatches = false; String nickname = entry.getNickname() != null ? entry.getNickname().toLowerCase() : "unnamed"; @@ -220,6 +222,10 @@ public class RequestHandler { } else if (fingerprint.startsWith(searchTerm.toUpperCase())) { /* Non-$-prefixed fingerprint matches. */ lineMatches = true; + } else if (base64Fingerprint != null && + base64Fingerprint.startsWith(searchTerm)) { + /* Base64-encoded fingerprint matches. */ + lineMatches = true; } else { List<String> addresses = entry.getAddresses(); for (String address : addresses) { diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index 46617c1..f6f060a 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -363,7 +363,8 @@ public class ResourceServlet extends HttpServlet { + "search=([0-9a-zA-Z+/\\.: \\$\\[\\]]+)" // capture parameter + "(?:&.*)*"); // skip remaining parameters private static Pattern searchParameterPattern = - Pattern.compile("^\\$?[0-9a-fA-F]{1,40}$|" /* Fingerprint. */ + Pattern.compile("^\\$?[0-9a-fA-F]{1,40}$|" /* Hex fingerprint. */ + + "^[0-9a-zA-Z+/]{1,27}$|" /* Base64 fingerprint. */ + "^[0-9a-zA-Z\\.]{1,19}$|" /* Nickname or IPv4 address. */ + "^\\[[0-9a-fA-F:\\.]{1,39}\\]?$|" /* IPv6 address. */ + "^[a-zA-Z_]+:[0-9a-zA-Z_,-]+$" /* Qualified search term. */); diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index 2660c26..d571505 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -69,9 +69,9 @@ public class ResponseBuilder { return this.charsWritten; } - private static final String PROTOCOL_VERSION = "1.2"; + private static final String PROTOCOL_VERSION = "2.0"; - private static final String NEXT_MAJOR_VERSION_SCHEDULED = "2014-11-15"; + private static final String NEXT_MAJOR_VERSION_SCHEDULED = null; private void writeRelays(List<SummaryDocument> relays, PrintWriter pw) { String nextMajorVersionScheduledLine = diff --git a/src/test/java/org/torproject/onionoo/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/ResourceServletTest.java index 0a861c3..1631661 100644 --- a/src/test/java/org/torproject/onionoo/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/ResourceServletTest.java @@ -560,6 +560,51 @@ public class ResourceServletTest { } @Test() + public void testSearchBase64FingerprintAlphaNum() { + this.assertSummaryDocument( + "/summary?search=AAxfVb1IFLkXzEdL1Tfxo7M8zio", 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testSearchBase64FingerprintSlash() { + this.assertSummaryDocument( + "/summary?search=ABwTs6Vacbl3ymXshVOdecZTo/w", 1, + new String[] { "Ferrari458" }, 0, null); + } + + @Test() + public void testSearchBase64FingerprintPlus() { + this.assertSummaryDocument( + "/summary?search=ACXBNsHzqe7+KuP5GPA7+iG1Bws", 1, + new String[] { "TimMayTribute" }, 0, null); + } + + @Test() + public void testSearchBase64FingerprintBridge() { + this.assertSummaryDocument( + "/summary?search=AACDGyNt/3PUCa0XtA4qcopTmU8", 0, null, 0, null); + } + + @Test() + public void testSearchBase64FingerprintPartial() { + this.assertSummaryDocument( + "/summary?search=AAx", 1, new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testSearchBase64HashedFingerprintTorkaZ() { + this.assertSummaryDocument( + "/summary?search=WqFMCNYpE+AFeprVhjtFjAzpTO4", 0, null, 0, null); + } + + @Test() + public void testSearchBase64Fingerprint28() { + this.assertErrorStatusCode( + "/summary?search=AAAAAAAAAAAA//AAAAAAAAAAAAAA", 400); + } + + @Test() public void testSearchIp() { this.assertSummaryDocument( "/summary?search=62.216.201.221", 1, new String[] { "TorkaZ" }, 0, diff --git a/web/protocol.html b/web/protocol.html index 8567c90..5b79d92 100644 --- a/web/protocol.html +++ b/web/protocol.html @@ -166,7 +166,7 @@ field on September 16, 2014.</li> <li>1.2: Added qualified search terms to "search" parameter on October 17, 2014.</li> <li>2.0: Extended search parameter to base64-encoded -fingerprints, scheduled for November 15, 2015.</li> +fingerprints on November 15, 2015.</li> </ul> </div>  @@ -272,20 +272,22 @@ Parameter values are case-insensitive. Return only (1) relays with the parameter value matching (part of a) nickname, (possibly $-prefixed) beginning of a -fingerprint, or beginning of an IP address, (2) bridges with (part of a) -nickname or (possibly $-prefixed) beginning of a hashed fingerprint, and -(3) relays and/or bridges matching a given qualified search term. +hex-encoded fingerprint, beginning of a base64-encoded fingerprint +without trailing equal signs, or beginning of an IP address, (2) bridges +with (part of a) nickname or (possibly $-prefixed) beginning of a hashed +hex-encoded fingerprint, and (3) relays and/or bridges matching a given +qualified search term. Searches by relay IP address include all known addresses used for onion routing and for exiting to the Internet. Searches for beginnings of IP addresses are performed on textual representations of canonical IP address forms, so that searches using CIDR notation or non-canonical forms will return empty results. -Searches are case-insensitive. +Searches are case-insensitive, except for base64-encoded fingerprints. If multiple search terms are given, separated by spaces, the intersection of all relays and bridges matching all search terms will be returned. -Full fingerprints should always be hashed using SHA-1, regardless of -searching for a relay or a bridge, in order to not accidentally leak -non-hashed bridge fingerprints in the URL. +Complete hex-encoded fingerprints should always be hashed using SHA-1, +regardless of searching for a relay or a bridge, in order to not +accidentally leak non-hashed bridge fingerprints in the URL. Qualified search terms have the form "key:value" (without double quotes) with "key" being one of the parameters listed here except for "search",

1 0

[onionoo/master] Parse search parameter from query string.
by karsten＠torproject.org 15 Nov '14

15 Nov '14

commit c13da0ea9197401953ad81b40bc030082d2c8708 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Oct 17 09:28:04 2014 +0200 Parse search parameter from query string. We can't rely on Tomcat to parse the query string, because it magically replaces `+` with the space character. This is going to break as soon as `+` will be a valid part of a search term. This is in preparation of #13135. --- .../onionoo/server/HttpServletRequestWrapper.java | 3 ++ .../torproject/onionoo/server/ResourceServlet.java | 17 +++++++-- .../torproject/onionoo/ResourceServletTest.java | 39 ++++++++++---------- 3 files changed, 36 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/server/HttpServletRequestWrapper.java b/src/main/java/org/torproject/onionoo/server/HttpServletRequestWrapper.java index 3349acd..6cf022f 100644 --- a/src/main/java/org/torproject/onionoo/server/HttpServletRequestWrapper.java +++ b/src/main/java/org/torproject/onionoo/server/HttpServletRequestWrapper.java @@ -21,4 +21,7 @@ public class HttpServletRequestWrapper { protected String[] getParameterValues(String parameterKey) { return this.request.getParameterValues(parameterKey); } + protected String getQueryString() { + return this.request.getQueryString(); + } } \ No newline at end of file diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index cd99dcb..46617c1 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -11,6 +11,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.servlet.ServletConfig; @@ -146,8 +147,8 @@ public class ResourceServlet extends HttpServlet { /* Filter relays and bridges matching the request. */ if (parameterMap.containsKey("search")) { - String[] searchTerms = this.parseSearchParameters( - parameterMap.get("search")); + String[] searchTerms = parseSearchParameters( + request.getQueryString()); if (searchTerms == null) { response.sendError(HttpServletResponse.SC_BAD_REQUEST); return; @@ -357,12 +358,22 @@ public class ResourceServlet extends HttpServlet { bridgeDocumentsWritten, charsWritten, writtenResponseMillis); } + private static Pattern searchQueryStringPattern = + Pattern.compile("(?:.*[\\?&])*?" // lazily skip other parameters + + "search=([0-9a-zA-Z+/\\.: \\$\\[\\]]+)" // capture parameter + + "(?:&.*)*"); // skip remaining parameters private static Pattern searchParameterPattern = Pattern.compile("^\\$?[0-9a-fA-F]{1,40}$|" /* Fingerprint. */ + "^[0-9a-zA-Z\\.]{1,19}$|" /* Nickname or IPv4 address. */ + "^\\[[0-9a-fA-F:\\.]{1,39}\\]?$|" /* IPv6 address. */ + "^[a-zA-Z_]+:[0-9a-zA-Z_,-]+$" /* Qualified search term. */); - private String[] parseSearchParameters(String parameter) { + protected static String[] parseSearchParameters(String queryString) { + Matcher searchQueryStringMatcher = searchQueryStringPattern.matcher( + queryString); + if (!searchQueryStringMatcher.matches()) { + return null; + } + String parameter = searchQueryStringMatcher.group(1); String[] searchParameters; if (parameter.contains(" ")) { searchParameters = parameter.split(" "); diff --git a/src/test/java/org/torproject/onionoo/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/ResourceServletTest.java index 11068dc..0a861c3 100644 --- a/src/test/java/org/torproject/onionoo/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/ResourceServletTest.java @@ -48,11 +48,13 @@ public class ResourceServletTest { private class TestingHttpServletRequestWrapper extends HttpServletRequestWrapper { private String requestURI; + private String queryString; private Map<String, String[]> parameterMap; private TestingHttpServletRequestWrapper(String requestURI, - Map<String, String[]> parameterMap) { + String queryString, Map<String, String[]> parameterMap) { super(null); this.requestURI = requestURI; + this.queryString = queryString; this.parameterMap = parameterMap == null ? new HashMap<String, String[]>() : parameterMap; } @@ -66,6 +68,9 @@ public class ResourceServletTest { protected String[] getParameterValues(String parameterKey) { return this.parameterMap.get(parameterKey); } + protected String getQueryString() { + return this.queryString; + } } private class TestingHttpServletResponseWrapper extends @@ -185,13 +190,12 @@ public class ResourceServletTest { bridgegummy); } - private void runTest(String requestURI, - Map<String, String[]> parameterMap) { + private void runTest(String request) { try { this.createDummyTime(); this.createDummyDocumentStore(); this.createNodeIndexer(); - this.makeRequest(requestURI, parameterMap); + this.makeRequest(request); this.parseResponse(); } catch (IOException e) { throw new RuntimeException(e); @@ -226,11 +230,14 @@ public class ResourceServletTest { NodeIndexerFactory.setNodeIndexer(newNodeIndexer); } - private void makeRequest(String requestURI, - Map<String, String[]> parameterMap) throws IOException { + private void makeRequest(String request) throws IOException { ResourceServlet rs = new ResourceServlet(); - this.request = new TestingHttpServletRequestWrapper(requestURI, - parameterMap); + String requestParts[] = request.split("\\?"); + String path = requestParts[0]; + String queryString = requestParts.length > 1 ? requestParts[1] : null; + Map<String, String[]> parameterMap = parseParameters(request); + this.request = new TestingHttpServletRequestWrapper(path, queryString, + parameterMap); this.response = new TestingHttpServletResponseWrapper(); rs.doGet(this.request, this.response); } @@ -246,18 +253,14 @@ public class ResourceServletTest { private void assertErrorStatusCode(String request, int errorStatusCode) { - String requestURI = parseRequestURI(request); - Map<String, String[]> parameters = parseParameters(request); - this.runTest(requestURI, parameters); + this.runTest(request); assertEquals(errorStatusCode, this.response.errorStatusCode); } private void assertSummaryDocument(String request, int expectedRelaysNumber, String[] expectedRelaysNicknames, int expectedBridgesNumber, String[] expectedBridgesNicknames) { - String requestURI = parseRequestURI(request); - Map<String, String[]> parameters = parseParameters(request); - this.runTest(requestURI, parameters); + this.runTest(request); assertNotNull(this.summaryDocument); assertEquals(expectedRelaysNumber, this.summaryDocument.relays.length); @@ -277,10 +280,6 @@ public class ResourceServletTest { } } - private String parseRequestURI(String request) { - return request.split("\\?")[0]; - } - private Map<String, String[]> parseParameters(String request) { Map<String, String[]> parameters = null; String[] uriParts = request.split("\\?"); @@ -327,7 +326,7 @@ public class ResourceServletTest { @Test() public void testValidSummaryRelay() throws IOException { - this.runTest("/summary", null); + this.runTest("/summary"); assertEquals("2013-04-24 12:00:00", this.summaryDocument.relays_published); assertEquals(3, this.summaryDocument.relays.length); @@ -347,7 +346,7 @@ public class ResourceServletTest { @Test() public void testValidSummaryBridge() { - this.runTest("/summary", null); + this.runTest("/summary"); assertEquals("2013-04-24 01:07:04", this.summaryDocument.bridges_published); assertEquals(3, this.summaryDocument.bridges.length);

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2014