September 2014 - tor-commits - lists.torproject.org

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

21 Sep '14

commit 658a31fb779bc36d77e88b9eff3b1c69eabe25fc Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 21 11:45:34 2014 +0000 Update translations for tor-launcher-network-settings --- el/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/el/network-settings.dtd b/el/network-settings.dtd index 0727666..b375a22 100644 --- a/el/network-settings.dtd +++ b/el/network-settings.dtd @@ -8,7 +8,7 @@ <!ENTITY torSettings.no "Οχι"> <!ENTITY torSettings.firstQuestion "Ποιο από τα παρακάτω περιγράφει καλύτερα την κατάστασή σας;"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> +<!ENTITY torSettings.configurePrompt1 "Σύνδεση στο Internet αυτού του υπολογιστή λογοκρίνεται ή προσεγγίζεται"> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> <!ENTITY torSettings.configure "Ρύθμιση "> <!ENTITY torSettings.connectPrompt2 "Θα ήθελα να συνδεθεί άμεσα με το δίκτυο Tor.">

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 21 Sep '14

21 Sep '14

commit 31a4020a373af8758a266fd23e123cbd85422e00 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 21 11:45:28 2014 +0000 Update translations for tor-launcher-properties --- el/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/el/torlauncher.properties b/el/torlauncher.properties index 7f10f07..baf2f3e 100644 --- a/el/torlauncher.properties +++ b/el/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited2=Επανεκκίνηση του Tor δεν θα κλείσει τις καρτέλες browser σας. torlauncher.tor_controlconn_failed=Δεν ήταν δυνατή η σύνδεση με την υποδοχη ελέγχου του Tor. torlauncher.tor_failed_to_start=Αδυναμία εκκίνησης του Tor. torlauncher.tor_control_failed=Απέτυχε να πάρει τον έλεγχο του Tor.

1 0

[arm/master] Taking advantage of str_tools.join()
by atagar＠torproject.org 21 Sep '14

21 Sep '14

commit 2045a1bcdd98a9e9d793b582d2cb5f1b6c905426 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Sep 17 10:17:48 2014 -0700 Taking advantage of str_tools.join() Couple bits we can nicely simplify with stem's new join() method. --- arm/graphing/bandwidth_stats.py | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/arm/graphing/bandwidth_stats.py b/arm/graphing/bandwidth_stats.py index 80c105b..57dd047 100644 --- a/arm/graphing/bandwidth_stats.py +++ b/arm/graphing/bandwidth_stats.py @@ -220,18 +220,12 @@ class BandwidthStats(graph_panel.GraphStats): panel.addstr(labeling_line + 2, 12, 'Connection Closed...') def get_title(self, width): - stats = list(self._title_stats) + stats_label = str_tools.join(self._title_stats, ', ', width - 13) - while True: - if not stats: - return 'Bandwidth:' - else: - label = 'Bandwidth (%s):' % ', '.join(stats) - - if len(label) > width: - del stats[-1] - else: - return label + if stats_label: + return 'Bandwidth (%s):' % stats_label + else: + return 'Bandwidth:' def primary_header(self, width): return self.get_header_label(width, True) @@ -253,19 +247,12 @@ class BandwidthStats(graph_panel.GraphStats): stats[0] = '%-14s' % ('%s/sec' % str_tools.size_label((self.last_primary if is_primary else self.last_secondary) * 1024, 1, False, CONFIG['features.graph.bw.transferInBytes'])) - # drops label's components if there's not enough space - - labeling = graph_type + ' (' + ''.join(stats).strip() + '):' - - while len(labeling) >= width: - if len(stats) > 1: - del stats[-1] - labeling = graph_type + ' (' + ''.join(stats).strip() + '):' - else: - labeling = graph_type + ':' - break + stats_label = str_tools.join(stats, '', width - len(graph_type) - 4) - return labeling + if stats_label: + return '%s (%s):' % (graph_type, stats_label) + else + return graph_type + ':' def get_color(self, is_primary): return DL_COLOR if is_primary else UL_COLOR

1 0

[arm/master] Better handle bandwidth averages
by atagar＠torproject.org 21 Sep '14

21 Sep '14

commit d9e5362891bd70c40ef318739d7be38a4277d478 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 18 10:08:04 2014 -0700 Better handle bandwidth averages Arm was made in a time before 'GETINFO traffic/*'. In fact, I added those options just for arm. :) We had pretty odd handling for both the bandwidth total and average, properly tracking the former but only basing the later on the time we've been running. Proper behavior is... * Base the average on the whole duration tor's been running if we can get both the bandwidth totals and tor's uptime. * If not then base both the total and average on the time arm's running. This is not only more correct and intuitive, but leads to much simpler code since we don't need to track the prepopulated values separately. Dropping a couple helper functions while we're at it. --- arm/graphing/bandwidth_stats.py | 108 ++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 59 deletions(-) diff --git a/arm/graphing/bandwidth_stats.py b/arm/graphing/bandwidth_stats.py index 57dd047..6fab22f 100644 --- a/arm/graphing/bandwidth_stats.py +++ b/arm/graphing/bandwidth_stats.py @@ -12,7 +12,7 @@ from arm.graphing import graph_panel from arm.util import bandwidth_from_state, tor_controller from stem.control import State -from stem.util import conf, str_tools +from stem.util import conf, str_tools, system def conf_handler(key, value): @@ -44,12 +44,6 @@ class BandwidthStats(graph_panel.GraphStats): def __init__(self, is_pause_buffer = False): graph_panel.GraphStats.__init__(self) - # stats prepopulated from tor's state file - - self.prepopulate_primary_total = 0 - self.prepopulate_secondary_total = 0 - self.prepopulate_ticks = 0 - self.accounting_stats = None # listens for tor reload (sighup) events which can reset the bandwidth @@ -63,25 +57,22 @@ class BandwidthStats(graph_panel.GraphStats): controller.add_status_listener(self.reset_listener) - # Initialized the bandwidth totals to the values reported by Tor. This - # uses a controller options introduced in ticket 2345: - # https://trac.torproject.org/projects/tor/ticket/2345 + # We both show our 'total' attributes and use it to determine our average. # - # further updates are still handled via BW events to avoid unnecessary - # GETINFO requests. - - self.initial_primary_total = 0 - self.initial_secondary_total = 0 + # If we can get *both* our start time and the totals from tor (via 'GETINFO + # traffic/*') then that's ideal, but if not then just track the total for + # the time arm is run. read_total = controller.get_info('traffic/read', None) - - if read_total and read_total.isdigit(): - self.initial_primary_total = int(read_total) / 1024 # Bytes -> KB - write_total = controller.get_info('traffic/written', None) + start_time = system.start_time(controller.get_pid(None)) - if write_total and write_total.isdigit(): - self.initial_secondary_total = int(write_total) / 1024 # Bytes -> KB + if read_total and write_total and start_time: + self.primary_total = int(read_total) / 1024 # Bytes -> KB + self.secondary_total = int(write_total) / 1024 # Bytes -> KB + self.start_time = start_time + else: + self.start_time = time.time() def clone(self, new_copy = None): if not new_copy: @@ -157,10 +148,6 @@ class BandwidthStats(graph_panel.GraphStats): self.last_primary, self.last_secondary = read_value, write_value - self.prepopulate_primary_total += read_value * 900 - self.prepopulate_secondary_total += write_value * 900 - self.prepopulate_ticks += 900 - self.primary_counts[interval_index].insert(0, read_value) self.secondary_counts[interval_index].insert(0, write_value) @@ -194,8 +181,13 @@ class BandwidthStats(graph_panel.GraphStats): panel.addstr(labeling_line, 0, ' ' * width) graph_column = min((width - 10) / 2, self.max_column) - primary_footer = '%s, %s' % (self._get_avg_label(True), self._get_total_label(True)) - secondary_footer = '%s, %s' % (self._get_avg_label(False), self._get_total_label(False)) + primary_total = 'total: %s' % _size_label(self.primary_total * 1024) + primary_average = 'avg: %s/sec' % _size_label(self.primary_total / (time.time() - self.start_time) * 1024) + primary_footer = '%s, %s' % (primary_average, primary_total) + + secondary_total = 'total: %s' % _size_label(self.secondary_total * 1024) + secondary_average = 'avg: %s/sec' % _size_label(self.primary_total / (time.time() - self.start_time) * 1024) + secondary_footer = '%s, %s' % (secondary_average, secondary_total) panel.addstr(labeling_line, 1, primary_footer, self.get_color(True)) panel.addstr(labeling_line, graph_column + 6, secondary_footer, self.get_color(False)) @@ -228,31 +220,38 @@ class BandwidthStats(graph_panel.GraphStats): return 'Bandwidth:' def primary_header(self, width): - return self.get_header_label(width, True) + stats = ['%-14s' % ('%s/sec' % _size_label(self.last_primary * 1024))] - def secondary_header(self, width): - return self.get_header_label(width, False) + # if wide then avg and total are part of the header, otherwise they're on + # the x-axis + + if width * 2 > COLLAPSE_WIDTH: + stats.append('- avg: %s/sec' % _size_label(self.primary_total / (time.time() - self.start_time) * 1024)) + stats.append(', total: %s' % _size_label(self.primary_total * 1024)) - def get_header_label(self, width, is_primary): - graph_type = 'Download' if is_primary else 'Upload' - stats = [''] + stats_label = str_tools.join(stats, '', width - 12) + + if stats_label: + return 'Download (%s):' % stats_label + else: + return 'Download:' + + def secondary_header(self, width): + stats = ['%-14s' % ('%s/sec' % _size_label(self.last_secondary * 1024))] # if wide then avg and total are part of the header, otherwise they're on # the x-axis if width * 2 > COLLAPSE_WIDTH: - stats = [''] * 3 - stats[1] = '- %s' % self._get_avg_label(is_primary) - stats[2] = ', %s' % self._get_total_label(is_primary) - - stats[0] = '%-14s' % ('%s/sec' % str_tools.size_label((self.last_primary if is_primary else self.last_secondary) * 1024, 1, False, CONFIG['features.graph.bw.transferInBytes'])) + stats.append('- avg: %s/sec' % _size_label(self.secondary_total / (time.time() - self.start_time) * 1024)) + stats.append(', total: %s' % _size_label(self.secondary_total * 1024)) - stats_label = str_tools.join(stats, '', width - len(graph_type) - 4) + stats_label = str_tools.join(stats, '', width - 10) if stats_label: - return '%s (%s):' % (graph_type, stats_label) - else - return graph_type + ':' + return 'Upload (%s):' % stats_label + else: + return 'Upload:' def get_color(self, is_primary): return DL_COLOR if is_primary else UL_COLOR @@ -282,11 +281,9 @@ class BandwidthStats(graph_panel.GraphStats): my_router_status_entry = controller.get_network_status(default = None) bw_measured = getattr(my_router_status_entry, 'bandwidth', None) - label_in_bytes = CONFIG['features.graph.bw.transferInBytes'] - if bw_rate and bw_burst: - bw_rate_label = str_tools.size_label(bw_rate, 1, False, label_in_bytes) - bw_burst_label = str_tools.size_label(bw_burst, 1, False, label_in_bytes) + bw_rate_label = _size_label(bw_rate) + bw_burst_label = _size_label(bw_burst) # if both are using rounded values then strip off the '.0' decimal @@ -302,23 +299,12 @@ class BandwidthStats(graph_panel.GraphStats): # if there isn't yet enough bandwidth measurements). if bw_observed and (not bw_measured or bw_measured == bw_observed): - stats.append('observed: %s/s' % str_tools.size_label(bw_observed, 1, False, label_in_bytes)) + stats.append('observed: %s/s' % _size_label(bw_observed)) elif bw_measured: - stats.append('measured: %s/s' % str_tools.size_label(bw_measured, 1, False, label_in_bytes)) + stats.append('measured: %s/s' % _size_label(bw_measured)) self._title_stats = stats - def _get_avg_label(self, is_primary): - total = self.primary_total if is_primary else self.secondary_total - total += self.prepopulate_primary_total if is_primary else self.prepopulate_secondary_total - - return 'avg: %s/sec' % str_tools.size_label((total / max(1, self.tick + self.prepopulate_ticks)) * 1024, 1, False, CONFIG['features.graph.bw.transferInBytes']) - - def _get_total_label(self, is_primary): - total = self.primary_total if is_primary else self.secondary_total - total += self.initial_primary_total if is_primary else self.initial_secondary_total - return 'total: %s' % str_tools.size_label(total * 1024, 1) - def _min_config(controller, *attributes): """ @@ -340,3 +326,7 @@ def _min_config(controller, *attributes): pass return value + + +def _size_label(byte_count): + return str_tools.size_label(byte_count, 1, is_bytes = CONFIG['features.graph.bw.transferInBytes'])

1 0

[arm/master] Taking advantage of get_effective_rate()
by atagar＠torproject.org 21 Sep '14

21 Sep '14

commit 8d5bb39570db5e2c15d75e83b6ea432384f0ba9e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 20 13:15:01 2014 -0700 Taking advantage of get_effective_rate() Droping our helper function that got this. --- arm/graphing/bandwidth_stats.py | 42 ++++++++++----------------------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/arm/graphing/bandwidth_stats.py b/arm/graphing/bandwidth_stats.py index 6fab22f..bc61bb6 100644 --- a/arm/graphing/bandwidth_stats.py +++ b/arm/graphing/bandwidth_stats.py @@ -272,14 +272,8 @@ class BandwidthStats(graph_panel.GraphStats): if not self._title_stats or not my_fingerprint or (event and my_fingerprint in event.idlist): stats = [] - bw_rate = _min_config(controller, 'BandwidthRate', 'RelayBandwidthRate', 'MaxAdvertisedBandwidth') - bw_burst = _min_config(controller, 'BandwidthBurst', 'RelayBandwidthBurst') - - my_server_descriptor = controller.get_server_descriptor(default = None) - bw_observed = getattr(my_server_descriptor, 'observed_bandwidth', None) - - my_router_status_entry = controller.get_network_status(default = None) - bw_measured = getattr(my_router_status_entry, 'bandwidth', None) + 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) @@ -288,8 +282,8 @@ class BandwidthStats(graph_panel.GraphStats): # if both are using rounded values then strip off the '.0' decimal if '.0' in bw_rate_label and '.0' in bw_burst_label: - bw_rate_label = bw_rate_label.replace('.0', '') - bw_burst_label = bw_burst_label.replace('.0', '') + bw_rate_label = bw_rate_label.split('.', 1)[0] + bw_burst_label = bw_burst_label.split('.', 1)[0] stats.append('limit: %s/s' % bw_rate_label) stats.append('burst: %s/s' % bw_burst_label) @@ -298,6 +292,12 @@ class BandwidthStats(graph_panel.GraphStats): # available or if the measured bandwidth is the observed (this happens # if there isn't yet enough bandwidth measurements). + my_server_descriptor = controller.get_server_descriptor(default = None) + bw_observed = getattr(my_server_descriptor, 'observed_bandwidth', None) + + my_router_status_entry = controller.get_network_status(default = None) + bw_measured = getattr(my_router_status_entry, 'bandwidth', None) + if bw_observed and (not bw_measured or bw_measured == bw_observed): stats.append('observed: %s/s' % _size_label(bw_observed)) elif bw_measured: @@ -306,27 +306,5 @@ class BandwidthStats(graph_panel.GraphStats): self._title_stats = stats -def _min_config(controller, *attributes): - """ - Provides the minimum of the given numeric bandwidth rate or burst config - options. - """ - - value = None - - for attr in attributes: - try: - attr_value = int(controller.get_conf(attr)) - - if attr_value == 0 and attr.startswith('Relay'): - continue # RelayBandwidthRate and RelayBandwidthBurst default to zero - - value = min(value, attr_value) if value else attr_value - except: - pass - - return value - - def _size_label(byte_count): return str_tools.size_label(byte_count, 1, is_bytes = CONFIG['features.graph.bw.transferInBytes'])

1 0

[arm/master] Revising title stat handling
by atagar＠torproject.org 21 Sep '14

21 Sep '14

commit d25eeb1a163ab7c0c4d69f211fa01056de70e6b7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 20 18:45:20 2014 -0700 Revising title stat handling Not only tidying up the code a bit but addressing several issues (stacktrace due to accessing a NewDesc event attribute that didn't exist, didn't properly initialize attributes, no reason in including observed bandwidth if measured is available). --- arm/graphing/bandwidth_stats.py | 60 +++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 34 deletions(-) diff --git a/arm/graphing/bandwidth_stats.py b/arm/graphing/bandwidth_stats.py index bc61bb6..0dffde2 100644 --- a/arm/graphing/bandwidth_stats.py +++ b/arm/graphing/bandwidth_stats.py @@ -44,18 +44,18 @@ class BandwidthStats(graph_panel.GraphStats): def __init__(self, is_pause_buffer = False): graph_panel.GraphStats.__init__(self) - self.accounting_stats = None - # listens for tor reload (sighup) events which can reset the bandwidth # rate/burst and if tor's using accounting controller = tor_controller() self._title_stats = [] + self._accounting_stats = None if not is_pause_buffer: self.reset_listener(controller, State.INIT, None) # initializes values controller.add_status_listener(self.reset_listener) + self.new_desc_event(None) # updates title params # We both show our 'total' attributes and use it to determine our average. # @@ -78,10 +78,7 @@ class BandwidthStats(graph_panel.GraphStats): if not new_copy: new_copy = BandwidthStats(True) - new_copy.accounting_stats = self.accounting_stats - - # attributes that would have been initialized from calling the reset_listener - + new_copy._accounting_stats = self._accounting_stats new_copy._title_stats = self._title_stats return graph_panel.GraphStats.clone(self, new_copy) @@ -89,14 +86,13 @@ class BandwidthStats(graph_panel.GraphStats): def reset_listener(self, controller, event_type, _): # updates title parameters and accounting status if they changed - self._title_stats = [] # force reset of title self.new_desc_event(None) # updates title params if event_type in (State.INIT, State.RESET) and CONFIG['features.graph.bw.accounting.show']: is_accounting_enabled = controller.get_info('accounting/enabled', None) == '1' - if is_accounting_enabled != bool(self.accounting_stats): - self.accounting_stats = tor_controller().get_accounting_stats(None) + if is_accounting_enabled != bool(self._accounting_stats): + self._accounting_stats = tor_controller().get_accounting_stats(None) # redraws the whole screen since our height changed @@ -160,9 +156,9 @@ class BandwidthStats(graph_panel.GraphStats): return time.time() - min(stats.last_read_time, stats.last_write_time) def bandwidth_event(self, event): - if self.accounting_stats and self.is_next_tick_redraw(): - if time.time() - self.accounting_stats.retrieved >= CONFIG['features.graph.bw.accounting.rate']: - self.accounting_stats = tor_controller().get_accounting_stats(None) + if self._accounting_stats and self.is_next_tick_redraw(): + if time.time() - self._accounting_stats.retrieved >= CONFIG['features.graph.bw.accounting.rate']: + self._accounting_stats = tor_controller().get_accounting_stats(None) # scales units from B to KB for graphing @@ -194,19 +190,19 @@ class BandwidthStats(graph_panel.GraphStats): # provides accounting stats if enabled - if self.accounting_stats: + if self._accounting_stats: if tor_controller().is_alive(): - hibernate_color = CONFIG['attr.hibernate_color'].get(self.accounting_stats.status, 'red') + hibernate_color = CONFIG['attr.hibernate_color'].get(self._accounting_stats.status, 'red') x, y = 0, labeling_line + 2 x = panel.addstr(y, x, 'Accounting (', curses.A_BOLD) - x = panel.addstr(y, x, self.accounting_stats.status, curses.A_BOLD, hibernate_color) + x = panel.addstr(y, x, self._accounting_stats.status, curses.A_BOLD, hibernate_color) x = panel.addstr(y, x, ')', curses.A_BOLD) - panel.addstr(y, 35, 'Time to reset: %s' % str_tools.short_time_label(self.accounting_stats.time_until_reset)) + panel.addstr(y, 35, 'Time to reset: %s' % str_tools.short_time_label(self._accounting_stats.time_until_reset)) - panel.addstr(y + 1, 2, '%s / %s' % (self.accounting_stats.read_bytes, self.accounting_stats.read_limit), self.get_color(True)) - panel.addstr(y + 1, 37, '%s / %s' % (self.accounting_stats.written_bytes, self.accounting_stats.write_limit), self.get_color(True)) + panel.addstr(y + 1, 2, '%s / %s' % (self._accounting_stats.read_bytes, self._accounting_stats.read_limit), self.get_color(True)) + panel.addstr(y + 1, 37, '%s / %s' % (self._accounting_stats.written_bytes, self._accounting_stats.write_limit), self.get_color(True)) else: panel.addstr(labeling_line + 2, 0, 'Accounting:', curses.A_BOLD) panel.addstr(labeling_line + 2, 12, 'Connection Closed...') @@ -258,11 +254,9 @@ class BandwidthStats(graph_panel.GraphStats): def get_content_height(self): base_height = graph_panel.GraphStats.get_content_height(self) - return base_height + 3 if self.accounting_stats else base_height + return base_height + 3 if self._accounting_stats else base_height def new_desc_event(self, event): - # updates self._title_stats with updated values - controller = tor_controller() if not controller.is_alive(): @@ -270,8 +264,9 @@ class BandwidthStats(graph_panel.GraphStats): my_fingerprint = controller.get_info('fingerprint', None) - if not self._title_stats or not my_fingerprint or (event and my_fingerprint in event.idlist): + if not event or (my_fingerprint and my_fingerprint in [fp for fp, _ in event.relays]): stats = [] + bw_rate = controller.get_effective_rate(None) bw_burst = controller.get_effective_rate(None, burst = True) @@ -288,20 +283,17 @@ class BandwidthStats(graph_panel.GraphStats): stats.append('limit: %s/s' % bw_rate_label) stats.append('burst: %s/s' % bw_burst_label) - # Provide the observed bandwidth either if the measured bandwidth isn't - # available or if the measured bandwidth is the observed (this happens - # if there isn't yet enough bandwidth measurements). - - my_server_descriptor = controller.get_server_descriptor(default = None) - bw_observed = getattr(my_server_descriptor, 'observed_bandwidth', None) - my_router_status_entry = controller.get_network_status(default = None) - bw_measured = getattr(my_router_status_entry, 'bandwidth', None) + measured_bw = getattr(my_router_status_entry, 'bandwidth', None) + + if measured_bw: + stats.append('measured: %s/s' % _size_label(measured_bw)) + else: + my_server_descriptor = controller.get_server_descriptor(default = None) + observed_bw = getattr(my_server_descriptor, 'observed_bandwidth', None) - if bw_observed and (not bw_measured or bw_measured == bw_observed): - stats.append('observed: %s/s' % _size_label(bw_observed)) - elif bw_measured: - stats.append('measured: %s/s' % _size_label(bw_measured)) + if observed_bw: + stats.append('observed: %s/s' % _size_label(observed_bw)) self._title_stats = stats

1 0

[stem/master] Adding get_effective_rate() to the Controller
by atagar＠torproject.org 21 Sep '14

21 Sep '14

commit 8ae878d48268ff38d232cc7c8e6ff40f8ec6324b Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 20 13:12:51 2014 -0700 Adding get_effective_rate() to the Controller Method to provide the bytes per second we're configured to relay at. Tor has this be the minimum of a few parameters so it's not as stright forward as 'gimme the GETCONF BandwidthRate'. --- docs/change_log.rst | 1 + stem/control.py | 42 +++++++++++++++++++++++++++++++++++++++ test/unit/control/controller.py | 23 +++++++++++++++++++++ 3 files changed, 66 insertions(+) diff --git a/docs/change_log.rst b/docs/change_log.rst index c5867e4..7297cb9 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -43,6 +43,7 @@ The following are only available within Stem's `git repository * **Controller** * Added :func:`~stem.control.Controller.get_accounting_stats` to the :class:`~stem.control.Controller` + * Added :func:`~stem.control.Controller.get_effective_rate` to the :class:`~stem.control.Controller` * Added :func:`~stem.control.BaseController.connection_time` to the :class:`~stem.control.BaseController` * Changed :func:`~stem.control.Controller.get_microdescriptor`, :func:`~stem.control.Controller.get_server_descriptor`, and :func:`~stem.control.Controller.get_network_status` to get our own descriptor if no fingerprint or nickname is provided. * Added :class:`~stem.exit_policy.ExitPolicy` methods for more easily handling 'private' policies (the `default prefix <https://www.torproject.org/docs/tor-manual.html.en#ExitPolicyRejectPrivate>`_) and the defaultly appended suffix. This includes :func:`~stem.exit_policy.ExitPolicy.has_private`, :func:`~stem.exit_policy.ExitPolicy.strip_private`, :func:`~stem.exit_policy.ExitPolicy.has_default`, and :func:`~stem.exit_policy.ExitPolicy.strip_default` :class:`~stem.exit_policy.ExitPolicy` methods in addition to :func:`~stem.exit_policy.ExitPolicyRule.is_private` and :func:`~stem.exit_policy.ExitPolicyRule.is_default` for the :class:`~stem.exit_policy.ExitPolicyRule`. (:trac:`10107`) diff --git a/stem/control.py b/stem/control.py index 04098c0..4688bd7 100644 --- a/stem/control.py +++ b/stem/control.py @@ -122,6 +122,7 @@ If you're fine with allowing your script to raise exceptions then this can be mo |- signal - sends a signal to the tor client |- is_newnym_available - true if tor would presently accept a NEWNYM signal |- get_newnym_wait - seconds until tor would accept a NEWNYM signal + |- get_effective_rate - provides our effective relaying rate limit |- is_geoip_unavailable - true if we've discovered our geoip db to be unavailable |- map_address - maps one address to another such that connections to the original are replaced with the other +- drop_guards - drops our set of guard relays and picks a new set @@ -2666,6 +2667,47 @@ class Controller(BaseController): return max(0.0, self._last_newnym + 10 - time.time()) + def get_effective_rate(self, default = UNDEFINED, burst = False): + """ + Provides the maximum rate this relay is configured to relay in bytes per + second. This is based on multiple torrc parameters if they're set... + + * Effective Rate = min(BandwidthRate, RelayBandwidthRate, MaxAdvertisedBandwidth) + * Effective Burst = min(BandwidthBurst, RelayBandwidthBurst) + + :param object default: response if the query fails + :param bool burst: provides the burst bandwidth, otherwise this provides + the standard rate + + :returns: **int** with the effective bandwidth rate in bytes per second + + :raises: :class:`stem.ControllerError` if the call fails and no default was + provided + """ + + if not burst: + attributes = ('BandwidthRate', 'RelayBandwidthRate', 'MaxAdvertisedBandwidth') + else: + attributes = ('BandwidthBurst', 'RelayBandwidthBurst') + + value = None + + for attr in attributes: + try: + attr_value = int(self.get_conf(attr)) + + if attr_value == 0 and attr.startswith('Relay'): + continue # RelayBandwidthRate and RelayBandwidthBurst default to zero + + value = min(value, attr_value) if value else attr_value + except stem.ControllerError as exc: + if default == UNDEFINED: + raise exc + else: + return default + + return value + def is_geoip_unavailable(self): """ Provides **True** if we've concluded hat our geoip database is unavailable, diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index 7c7911e..948068f 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -588,6 +588,29 @@ class TestControl(unittest.TestCase): for test_input in malformed_inputs: self.assertRaises(ProtocolError, _parse_circ_path, test_input) + @patch('stem.control.Controller.get_conf') + def test_get_effective_rate(self, get_conf_mock): + """ + Exercise the get_effective_rate() method. + """ + + # check default if nothing was set + + get_conf_mock.side_effect = lambda param, **kwargs: { + 'BandwidthRate': '1073741824', + 'BandwidthBurst': '1073741824', + 'RelayBandwidthRate': '0', + 'RelayBandwidthBurst': '0', + 'MaxAdvertisedBandwidth': '1073741824', + }[param] + + self.assertEqual(1073741824, self.controller.get_effective_rate()) + self.assertEqual(1073741824, self.controller.get_effective_rate(burst = True)) + + get_conf_mock.side_effect = ControllerError('nope, too bad') + self.assertRaises(ControllerError, self.controller.get_effective_rate) + self.assertEqual('my_default', self.controller.get_effective_rate('my_default')) + @patch('stem.control.Controller.get_version') def test_drop_guards(self, get_version_mock): """

1 0

[bridgedb/develop] Add obfs4 bridge line unittests and regression tests for #12932.
by isis＠torproject.org 20 Sep '14

20 Sep '14

commit 6f29393d48612f1a5fee97d889971fefa671b877 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Sep 6 02:59:24 2014 +0000 Add obfs4 bridge line unittests and regression tests for #12932. --- lib/bridgedb/test/test_https.py | 133 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index bb783fb..2262db3 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -218,3 +218,136 @@ class HTTPTests(unittest.TestCase): self.assertEquals(PT, pt) self.assertTrue(password.find("password=") != -1, "Password field missing expected text") + + def test_get_obfs4_ipv4(self): + """Try asking for obfs4 bridges, and check that the PT arguments in the + returned bridge lines were space-separated. + + This is a regression test for #12932, see + https://bugs.torproject.org/12932. + """ + if os.environ.get("CI"): + if not self.pid or not processExists(self.pid): + raise FailTest("Could not start BridgeDB process on CI server!") + if not self.pid or not processExists(self.pid): + raise SkipTest("Can't run test: no BridgeDB process running.") + + self.openBrowser() + self.goToOptionsPage() + + PT = 'obfs4' + + try: + soup = self.submitOptions(transport=PT, ipv6=False, + captchaResponse=CAPTCHA_RESPONSE) + except ValueError as error: + if 'non-disabled' in str(error): + raise SkipTest("Pluggable Transport obfs4 is currently disabled.") + + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=6) + for bridge in bridges: + pt = bridge[0] + ptArgs = bridge[-3:] + self.assertEquals(PT, pt) + self.assertTrue(len(ptArgs) == 3, + ("Expected obfs4 bridge line to have 3 PT args, " + "found %d instead: %s") % (len(ptArgs), ptArgs)) + + def test_get_obfs4_ipv4_iatmode(self): + """Ask for obfs4 bridges and check that there is an 'iat-mode' PT + argument in the bridge lines. + """ + if os.environ.get("CI"): + if not self.pid or not processExists(self.pid): + raise FailTest("Could not start BridgeDB process on CI server!") + if not self.pid or not processExists(self.pid): + raise SkipTest("Can't run test: no BridgeDB process running.") + + self.openBrowser() + self.goToOptionsPage() + + PT = 'obfs4' + + try: + soup = self.submitOptions(transport=PT, ipv6=False, + captchaResponse=CAPTCHA_RESPONSE) + except ValueError as error: + if 'non-disabled' in str(error): + raise SkipTest("Pluggable Transport obfs4 is currently disabled.") + + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=6) + for bridge in bridges: + ptArgs = bridge[-3:] + hasIATMode = False + for arg in ptArgs: + if 'iat-mode' in arg: + hasIATMode = True + + self.assertTrue(hasIATMode, + "obfs4 bridge line is missing 'iat-mode' PT arg.") + + def test_get_obfs4_ipv4_publickey(self): + """Ask for obfs4 bridges and check that there is an 'public-key' PT + argument in the bridge lines. + """ + if os.environ.get("CI"): + if not self.pid or not processExists(self.pid): + raise FailTest("Could not start BridgeDB process on CI server!") + if not self.pid or not processExists(self.pid): + raise SkipTest("Can't run test: no BridgeDB process running.") + + self.openBrowser() + self.goToOptionsPage() + + PT = 'obfs4' + + try: + soup = self.submitOptions(transport=PT, ipv6=False, + captchaResponse=CAPTCHA_RESPONSE) + except ValueError as error: + if 'non-disabled' in str(error): + raise SkipTest("Pluggable Transport obfs4 is currently disabled.") + + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=6) + for bridge in bridges: + ptArgs = bridge[-3:] + hasPublicKey = False + for arg in ptArgs: + if 'public-key' in arg: + hasPublicKey = True + + self.assertTrue(hasPublicKey, + "obfs4 bridge line is missing 'public-key' PT arg.") + + def test_get_obfs4_ipv4_nodeid(self): + """Ask for obfs4 bridges and check that there is an 'node-id' PT + argument in the bridge lines. + """ + if os.environ.get("CI"): + if not self.pid or not processExists(self.pid): + raise FailTest("Could not start BridgeDB process on CI server!") + if not self.pid or not processExists(self.pid): + raise SkipTest("Can't run test: no BridgeDB process running.") + + self.openBrowser() + self.goToOptionsPage() + + PT = 'obfs4' + + try: + soup = self.submitOptions(transport=PT, ipv6=False, + captchaResponse=CAPTCHA_RESPONSE) + except ValueError as error: + if 'non-disabled' in str(error): + raise SkipTest("Pluggable Transport obfs4 is currently disabled.") + + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=6) + for bridge in bridges: + ptArgs = bridge[-3:] + hasNodeID = False + for arg in ptArgs: + if 'node-id' in arg: + hasNodeID = True + + self.assertTrue(hasNodeID, + "obfs4 bridge line is missing 'node-id' PT arg.")

1 0

[bridgedb/develop] Bump Leekspin to 1.1.3; it now supports obfs4 mocking.
by isis＠torproject.org 20 Sep '14

20 Sep '14

commit 40818e8b1e2e61516ab451306dc6ec489c01f33e Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Sep 5 07:15:21 2014 +0000 Bump Leekspin to 1.1.3; it now supports obfs4 mocking. --- .test.requirements.txt | 2 +- .travis.requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.test.requirements.txt b/.test.requirements.txt index ca2c01c..78ad3c0 100644 --- a/.test.requirements.txt +++ b/.test.requirements.txt @@ -6,7 +6,7 @@ # $ make coverage # coverage==3.7.1 -leekspin==1.0.0 +leekspin==1.1.3 mechanize==0.2.5 pep8==1.5.7 # pylint must be pinned until pylint bug #203 is fixed. See diff --git a/.travis.requirements.txt b/.travis.requirements.txt index b10bae4..fcc4c77 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -15,7 +15,7 @@ #------------------------------------------------------------------------------ coverage==3.7.1 coveralls==0.4.2 -leekspin==1.0.0 +leekspin==1.1.3 mechanize==0.2.5 pep8==1.5.7 # pylint must be pinned until pylint bug #203 is fixed. See diff --git a/setup.py b/setup.py index 47a2cbf..d6f9a20 100644 --- a/setup.py +++ b/setup.py @@ -285,7 +285,7 @@ setuptools.setup( scripts=['scripts/bridgedb'], extras_require={'test': ["sure==1.2.2", "coverage==3.7.1", - "leekspin==1.0.0"]}, + "leekspin==1.1.3"]}, zip_safe=False, cmdclass=get_cmdclass(), include_package_data=True,

1 0

[bridgedb/develop] Change bridge line PT args to be space-separated.
by isis＠torproject.org 20 Sep '14

20 Sep '14

commit 487c1b6c16e979bc448ddd415364e28bd764d29a Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Sep 5 00:54:33 2014 +0000 Change bridge line PT args to be space-separated. * FIXES #12932 https://bugs.torproject.org/12932 --- lib/bridgedb/Bridges.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index fa9c246..613e2db 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -548,7 +548,7 @@ class PluggableTransport(object): if includeFingerprint: sections.append(self.bridge.fingerprint) - args = ",".join(["%s=%s" % (k, v) for k, v in self.argdict.items()]) + args = " ".join(["%s=%s" % (k, v) for k, v in self.argdict.items()]) sections.append(args) line = ' '.join(sections)

1 0