tor-commits June 2014

tor-commits@lists.torproject.org

21 participants
1212 discussions

[arm/master] Dropping unnecessary address value from header
by atagar＠torproject.org 30 Jun '14

30 Jun '14

commit 4a307329553e0039d4b8f80bcfa150e605d68863 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 28 13:18:13 2014 -0700 Dropping unnecessary address value from header We were tracking our address and or_address but the former was simply used as a default if the former was unset. Might as well simplify this, and drop the pointless GETINFO query if we don't need it. --- arm/header_panel.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 … [View More]

1 0

[arm/master] Bandwidth stats failed with a stacktrace if we're missing our own descriptor
by atagar＠torproject.org 30 Jun '14

30 Jun '14

commit bad52b6394d0651ac7131f9e807e7c362b03eaf9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 29 15:13:50 2014 -0700 Bandwidth stats failed with a stacktrace if we're missing our own descriptor Traceback (most recent call last): File "./run_arm", line 47, in <module> main() File "./run_arm", line 16, in main arm.starter.main() File "/usr/lib/python2.7/stem/util/conf.py", line 288, in wrapped return func(*args,… [View More] config = config, **kwargs) File "/home/atagar/Desktop/arm/arm/starter.py", line 92, in main curses.wrapper(arm.controller.start_arm) File "/usr/lib/python2.7/curses/wrapper.py", line 43, in wrapper return func(stdscr, *args, **kwds) File "/home/atagar/Desktop/arm/arm/controller.py", line 589, in start_arm init_controller(stdscr, CONFIG['start_time']) File "/home/atagar/Desktop/arm/arm/controller.py", line 183, in init_controller bw_stats = arm.graphing.bandwidth_stats.BandwidthStats() File "/home/atagar/Desktop/arm/arm/graphing/bandwidth_stats.py", line 72, in __init__ self.reset_listener(controller, State.INIT, None) # initializes values File "/home/atagar/Desktop/arm/arm/graphing/bandwidth_stats.py", line 114, in reset_listener self.new_desc_event(None) # updates title params File "/home/atagar/Desktop/arm/arm/graphing/bandwidth_stats.py", line 417, in new_desc_event bw_measured = get_my_bandwidth_measured(controller) File "/home/atagar/Desktop/arm/arm/graphing/bandwidth_stats.py", line 595, in get_my_bandwidth_measured my_status_entry = controller.get_network_status(my_fingerprint) File "/usr/lib/python2.7/stem/control.py", line 1529, in get_network_status raise exc stem.InvalidArguments: GETINFO request contained unrecognized keywords: ns/id/1A94D1A794FCB2F8B6CBC179EF8FDD4008A98D3B --- arm/graphing/bandwidth_stats.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arm/graphing/bandwidth_stats.py b/arm/graphing/bandwidth_stats.py index b781d3e..1fffa4a 100644 --- a/arm/graphing/bandwidth_stats.py +++ b/arm/graphing/bandwidth_stats.py @@ -567,7 +567,7 @@ def get_my_bandwidth_observed(controller): my_fingerprint = controller.get_info("fingerprint", None) if my_fingerprint: - my_descriptor = controller.get_server_descriptor(my_fingerprint) + my_descriptor = controller.get_server_descriptor(my_fingerprint, None) if my_descriptor: return my_descriptor.observed_bandwidth @@ -592,7 +592,7 @@ def get_my_bandwidth_measured(controller): my_fingerprint = controller.get_info("fingerprint", None) if my_fingerprint: - my_status_entry = controller.get_network_status(my_fingerprint) + my_status_entry = controller.get_network_status(my_fingerprint, None) if my_status_entry and hasattr(my_status_entry, 'bandwidth'): return my_status_entry.bandwidth [View Less]

1 0

[arm/master] Moving is_connected attribute into Sampling
by atagar＠torproject.org 30 Jun '14

30 Jun '14

commit 58b766222d5784d007ef093eb6dbcc6e37b8bbba Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 29 17:07:52 2014 -0700 Moving is_connected attribute into Sampling Moving the attribute that indicates if we're connected to tor from the header panel to the sampling. I can see why it was tracked separately, but it will probably be better handled by cloning sampling attributes when disconnected. --- arm/header_panel.py | 16 +++++++--------- 1 file … [View More]changed, 7 insertions(+), 9 deletions(-) diff --git a/arm/header_panel.py b/arm/header_panel.py index 550dd65..d3d3945 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -42,7 +42,6 @@ class HeaderPanel(panel.Panel, threading.Thread): threading.Thread.__init__(self) self.setDaemon(True) - self._is_tor_connected = tor_controller().is_alive() self._halt = False # terminates thread if true self._cond = threading.Condition() # used for pausing the thread @@ -95,7 +94,7 @@ class HeaderPanel(panel.Panel, threading.Thread): if key in (ord('n'), ord('N')) and tor_controller().is_newnym_available(): self.send_newnym() - elif key in (ord('r'), ord('R')) and not self._is_tor_connected: + elif key in (ord('r'), ord('R')) and not self.vals.is_connected: #oldSocket = tor_tools.get_conn().get_controller().get_socket() # #controller = None @@ -181,7 +180,7 @@ class HeaderPanel(panel.Panel, threading.Thread): else: # non-relay (client only) - if self._is_tor_connected: + if self.vals.is_connected: self.addstr(1, x, 'Relaying Disabled', ui_tools.get_color('cyan')) x += 17 else: @@ -229,7 +228,7 @@ class HeaderPanel(panel.Panel, threading.Thread): uptime_label = '' if vals.start_time: - if self.is_paused() or not self._is_tor_connected: + if self.is_paused() or not self.vals.is_connected: # freeze the uptime when paused or the tor process is stopped uptime_label = str_tools.get_short_time_label(self.get_pause_time() - vals.start_time) else: @@ -237,7 +236,7 @@ class HeaderPanel(panel.Panel, threading.Thread): sys_fields = ((0, 'cpu: %s%% tor, %s%% arm' % (vals.tor_cpu, vals.arm_cpu)), (27, 'mem: %s (%s%%)' % (memory_label, vals.memory)), - (47, 'pid: %s' % (vals.pid if self._is_tor_connected else '')), + (47, 'pid: %s' % (vals.pid if self.vals.is_connected else '')), (59, 'uptime: %s' % uptime_label)) for (start, label) in sys_fields: @@ -281,7 +280,7 @@ class HeaderPanel(panel.Panel, threading.Thread): # Line 5 / Line 3 Left (flags) - if self._is_tor_connected: + if self.vals.is_connected: y, x = (2 if is_wide else 4, 0) self.addstr(y, x, 'flags: ') x += 7 @@ -406,7 +405,7 @@ class HeaderPanel(panel.Panel, threading.Thread): while not self._halt: current_time = time.time() - if self.is_paused() or current_time - last_draw < 1 or not self._is_tor_connected: + if self.is_paused() or current_time - last_draw < 1 or not self.vals.is_connected: self._cond.acquire() if not self._halt: @@ -463,7 +462,6 @@ class HeaderPanel(panel.Panel, threading.Thread): if event_type in (State.INIT, State.RESET): initial_height = self.get_height() - self._is_tor_connected = True self._halt_time = None self.vals = Sampling(self.vals) @@ -478,7 +476,6 @@ class HeaderPanel(panel.Panel, threading.Thread): # just need to redraw ourselves self.redraw(True) elif event_type == State.CLOSED: - self._is_tor_connected = False self._halt_time = time.time() self.vals = Sampling(self.vals) @@ -501,6 +498,7 @@ class Sampling(object): start_time = stem.util.system.get_start_time(controller.get_pid(None)) tor_resources = arm.util.tracker.get_resource_tracker().get_value() + self.is_connected = controller.is_alive() self.retrieved = time.time() self.arm_total_cpu_time = sum(os.times()[:3]) [View Less]

1 0

[arm/master] Tests didn't reflect tracker's renamed methods
by atagar＠torproject.org 30 Jun '14

30 Jun '14

commit f700a3a4459fc2d0b5b1937199cbc94c1ba6d2f4 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 28 12:09:38 2014 -0700 Tests didn't reflect tracker's renamed methods We renamed a few methods in our tracker util but make them match in the tests, breaking our unit tests. --- test/util/tracker/connection_tracker.py | 28 ++++++++++++++-------------- test/util/tracker/resource_tracker.py | 12 ++++++------ 2 files changed, 20 insertions(+), 20 … [View More]deletions(-) diff --git a/test/util/tracker/connection_tracker.py b/test/util/tracker/connection_tracker.py index bdb1d69..0e756de 100644 --- a/test/util/tracker/connection_tracker.py +++ b/test/util/tracker/connection_tracker.py @@ -17,21 +17,21 @@ class TestConnectionTracker(unittest.TestCase): @patch('arm.util.tracker.connection.get_connections') @patch('arm.util.tracker.system', Mock(return_value = Mock())) @patch('arm.util.tracker.connection.get_system_resolvers', Mock(return_value = [connection.Resolver.NETSTAT])) - def test_fetching_connections(self, get_connections_mock, tor_controller_mock): + def test_fetching_connections(self, get_value_mock, tor_controller_mock): tor_controller_mock().get_pid.return_value = 12345 - get_connections_mock.return_value = [CONNECTION_1, CONNECTION_2, CONNECTION_3] + get_value_mock.return_value = [CONNECTION_1, CONNECTION_2, CONNECTION_3] with ConnectionTracker(0.04) as daemon: time.sleep(0.01) - connections = daemon.get_connections() + connections = daemon.get_value() self.assertEqual(1, daemon.run_counter()) self.assertEqual([CONNECTION_1, CONNECTION_2, CONNECTION_3], connections) - get_connections_mock.return_value = [] # no connection results + get_value_mock.return_value = [] # no connection results time.sleep(0.05) - connections = daemon.get_connections() + connections = daemon.get_value() self.assertEqual(2, daemon.run_counter()) self.assertEqual([], connections) @@ -40,37 +40,37 @@ class TestConnectionTracker(unittest.TestCase): @patch('arm.util.tracker.connection.get_connections') @patch('arm.util.tracker.system', Mock(return_value = Mock())) @patch('arm.util.tracker.connection.get_system_resolvers', Mock(return_value = [connection.Resolver.NETSTAT, connection.Resolver.LSOF])) - def test_resolver_failover(self, get_connections_mock, tor_controller_mock): + def test_resolver_failover(self, get_value_mock, tor_controller_mock): tor_controller_mock().get_pid.return_value = 12345 - get_connections_mock.side_effect = IOError() + get_value_mock.side_effect = IOError() with ConnectionTracker(0.01) as daemon: time.sleep(0.03) self.assertEqual([connection.Resolver.NETSTAT, connection.Resolver.LSOF], daemon._resolvers) - self.assertEqual([], daemon.get_connections()) + self.assertEqual([], daemon.get_value()) time.sleep(0.05) self.assertEqual([connection.Resolver.LSOF], daemon._resolvers) - self.assertEqual([], daemon.get_connections()) + self.assertEqual([], daemon.get_value()) time.sleep(0.05) self.assertEqual([], daemon._resolvers) - self.assertEqual([], daemon.get_connections()) + self.assertEqual([], daemon.get_value()) # Now make connection resolution work. We still shouldn't provide any # results since we stopped looking. - get_connections_mock.return_value = [CONNECTION_1, CONNECTION_2] - get_connections_mock.side_effect = None + get_value_mock.return_value = [CONNECTION_1, CONNECTION_2] + get_value_mock.side_effect = None time.sleep(0.05) - self.assertEqual([], daemon.get_connections()) + self.assertEqual([], daemon.get_value()) # Finally, select a custom resolver. This should cause us to query again # reguardless of our prior failures. daemon.set_custom_resolver(connection.Resolver.NETSTAT) time.sleep(0.05) - self.assertEqual([CONNECTION_1, CONNECTION_2], daemon.get_connections()) + self.assertEqual([CONNECTION_1, CONNECTION_2], daemon.get_value()) diff --git a/test/util/tracker/resource_tracker.py b/test/util/tracker/resource_tracker.py index 41ef80e..10509cf 100644 --- a/test/util/tracker/resource_tracker.py +++ b/test/util/tracker/resource_tracker.py @@ -23,7 +23,7 @@ class TestResourceTracker(unittest.TestCase): with ResourceTracker(0.04) as daemon: time.sleep(0.01) - resources = daemon.get_resource_usage() + resources = daemon.get_value() self.assertEqual(1, daemon.run_counter()) self.assertEqual(0.0, resources.cpu_sample) @@ -35,7 +35,7 @@ class TestResourceTracker(unittest.TestCase): resources_via_proc_mock.return_value = (800.3, 3.2, 6020, 0.26) time.sleep(0.05) - resources = daemon.get_resource_usage() + resources = daemon.get_value() self.assertEqual(2, daemon.run_counter()) self.assertEqual(6.600189933523267, resources.cpu_sample) @@ -60,7 +60,7 @@ class TestResourceTracker(unittest.TestCase): with ResourceTracker(0.04) as daemon: time.sleep(0.01) - resources = daemon.get_resource_usage() + resources = daemon.get_value() self.assertEqual(1, daemon.run_counter()) self.assertEqual(0.0, resources.cpu_sample) @@ -75,7 +75,7 @@ class TestResourceTracker(unittest.TestCase): with ResourceTracker(0.04) as daemon: time.sleep(0.01) - resources = daemon.get_resource_usage() + resources = daemon.get_value() self.assertEqual(1, daemon.run_counter()) self.assertEqual(0.0, resources.cpu_sample) @@ -97,7 +97,7 @@ class TestResourceTracker(unittest.TestCase): time.sleep(0.03) self.assertEqual(True, daemon._use_proc) - resources = daemon.get_resource_usage() + resources = daemon.get_value() self.assertEqual(0, daemon.run_counter()) self.assertEqual(0.0, resources.cpu_sample) @@ -112,7 +112,7 @@ class TestResourceTracker(unittest.TestCase): self.assertEqual(False, daemon._use_proc) - resources = daemon.get_resource_usage() + resources = daemon.get_value() self.assertEqual(0.0, resources.cpu_sample) self.assertEqual(43.875, resources.cpu_average) [View Less]

1 0

[arm/master] Dropping lock from header panel
by atagar＠torproject.org 30 Jun '14

30 Jun '14

commit cc7930f360c0a1b2515b9a44c453d81f737d51ef Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 28 13:02:25 2014 -0700 Dropping lock from header panel Now that we're using a class rather than dict for our values we don't need a lock. Usage can just get a reference to the last values then work from that. --- arm/header_panel.py | 215 ++++++++++++++++++++++++--------------------------- 1 file changed, 103 insertions(+), 112 deletions(-) diff --git a/… [View More]arm/header_panel.py b/arm/header_panel.py index 5f382c3..0d1f0bd 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -56,11 +56,7 @@ class HeaderPanel(panel.Panel, threading.Thread): self._is_fd_sixty_percent_warned = False self._is_fd_ninety_percent_warned = False - self.vals = {} - self.vals_lock = threading.RLock() - - with self.vals_lock: - self.vals = Sampling() + self.vals = Sampling() # listens for tor reload (sighup) events @@ -92,7 +88,7 @@ class HeaderPanel(panel.Panel, threading.Thread): is_wide = self.get_parent().getmaxyx()[1] >= MIN_DUAL_COL_WIDTH if not is_wide: - arm.popups.show_msg("Requesting a new identity", 1) + arm.popups.show_msg('Requesting a new identity', 1) def handle_key(self, key): is_keystroke_consumed = True @@ -148,7 +144,7 @@ class HeaderPanel(panel.Panel, threading.Thread): return is_keystroke_consumed def draw(self, width, height): - self.vals_lock.acquire() + vals = self.vals is_wide = width + 1 >= MIN_DUAL_COL_WIDTH # space available for content @@ -161,46 +157,46 @@ class HeaderPanel(panel.Panel, threading.Thread): # Line 1 / Line 1 Left (system and tor version information) - sys_name_label = "arm - %s" % self.vals.hostname + sys_name_label = 'arm - %s' % vals.hostname content_space = min(left_width, 40) if len(sys_name_label) + 10 <= content_space: - sys_type_label = "%s %s" % (self.vals.os_name, self.vals.os_version) + sys_type_label = '%s %s' % (vals.os_name, vals.os_version) sys_type_label = ui_tools.crop_str(sys_type_label, content_space - len(sys_name_label) - 3, 4) - self.addstr(0, 0, "%s (%s)" % (sys_name_label, sys_type_label)) + self.addstr(0, 0, '%s (%s)' % (sys_name_label, sys_type_label)) else: self.addstr(0, 0, ui_tools.crop_str(sys_name_label, content_space)) content_space = left_width - 43 - if 7 + len(self.vals.version) + len(self.vals.version_status) <= content_space: - if self.vals.version != "Unknown": - version_color = CONFIG['attr.version_status_colors'].get(self.vals.version_status, 'white') + if 7 + len(vals.version) + len(vals.version_status) <= content_space: + if vals.version != 'Unknown': + version_color = CONFIG['attr.version_status_colors'].get(vals.version_status, 'white') - label_prefix = "Tor %s (" % self.vals.version + label_prefix = 'Tor %s (' % vals.version self.addstr(0, 43, label_prefix) - self.addstr(0, 43 + len(label_prefix), self.vals.version_status, ui_tools.get_color(version_color)) - self.addstr(0, 43 + len(label_prefix) + len(self.vals.version_status), ")") + self.addstr(0, 43 + len(label_prefix), vals.version_status, ui_tools.get_color(version_color)) + self.addstr(0, 43 + len(label_prefix) + len(vals.version_status), ')') elif 11 <= content_space: - self.addstr(0, 43, ui_tools.crop_str("Tor %s" % self.vals.version, content_space, 4)) + self.addstr(0, 43, ui_tools.crop_str('Tor %s' % vals.version, content_space, 4)) # Line 2 / Line 2 Left (tor ip/port information) x, include_control_port = 0, True - if self.vals.or_port: - my_address = "Unknown" + if vals.or_port: + my_address = 'Unknown' - if self.vals.or_address: - my_address = self.vals.or_address - elif self.vals.address: - my_address = self.vals.address + if vals.or_address: + my_address = vals.or_address + elif vals.address: + my_address = vals.address # acting as a relay (we can assume certain parameters are set - dir_port_label = ", Dir Port: %s" % self.vals.dir_port if self.vals.dir_port != "0" else "" + dir_port_label = ', Dir Port: %s' % vals.dir_port if vals.dir_port != '0' else '' - for label in (self.vals.nickname, " - " + my_address, ":%s" % self.vals.or_port, dir_port_label): + for label in (vals.nickname, ' - ' + my_address, ':%s' % vals.or_port, dir_port_label): if x + len(label) <= left_width: self.addstr(1, x, label) x += len(label) @@ -210,63 +206,63 @@ class HeaderPanel(panel.Panel, threading.Thread): # non-relay (client only) if self._is_tor_connected: - self.addstr(1, x, "Relaying Disabled", ui_tools.get_color("cyan")) + self.addstr(1, x, 'Relaying Disabled', ui_tools.get_color('cyan')) x += 17 else: status_time = tor_controller().get_latest_heartbeat() if status_time: - status_time_label = time.strftime("%H:%M %m/%d/%Y, ", time.localtime(status_time)) + status_time_label = time.strftime('%H:%M %m/%d/%Y, ', time.localtime(status_time)) else: - status_time_label = "" # never connected to tor + status_time_label = '' # never connected to tor - self.addstr(1, x, "Tor Disconnected", curses.A_BOLD | ui_tools.get_color("red")) - self.addstr(1, x + 16, " (%spress r to reconnect)" % status_time_label) + self.addstr(1, x, 'Tor Disconnected', curses.A_BOLD | ui_tools.get_color('red')) + self.addstr(1, x + 16, ' (%spress r to reconnect)' % status_time_label) x += 39 + len(status_time_label) include_control_port = False if include_control_port: - if self.vals.control_port == "0": + if vals.control_port == '0': # connected via a control socket - self.addstr(1, x, ", Control Socket: %s" % self.vals.socket_path) + self.addstr(1, x, ', Control Socket: %s' % vals.socket_path) else: - if self.vals.is_password_auth: - auth_type = "password" - elif self.vals.is_cookie_auth: - auth_type = "cookie" + if vals.is_password_auth: + auth_type = 'password' + elif vals.is_cookie_auth: + auth_type = 'cookie' else: - auth_type = "open" + auth_type = 'open' - if x + 19 + len(self.vals.control_port) + len(auth_type) <= left_width: - auth_color = "red" if auth_type == "open" else "green" - self.addstr(1, x, ", Control Port (") + if x + 19 + len(vals.control_port) + len(auth_type) <= left_width: + auth_color = 'red' if auth_type == 'open' else 'green' + self.addstr(1, x, ', Control Port (') self.addstr(1, x + 16, auth_type, ui_tools.get_color(auth_color)) - self.addstr(1, x + 16 + len(auth_type), "): %s" % self.vals.control_port) - elif x + 16 + len(self.vals.control_port) <= left_width: - self.addstr(1, 0, ", Control Port: %s" % self.vals.control_port) + self.addstr(1, x + 16 + len(auth_type), '): %s' % vals.control_port) + elif x + 16 + len(vals.control_port) <= left_width: + self.addstr(1, 0, ', Control Port: %s' % vals.control_port) # Line 3 / Line 1 Right (system usage info) y, x = (0, left_width) if is_wide else (2, 0) - if self.vals.rss != "0": - memory_label = str_tools.get_size_label(int(self.vals.rss)) + if vals.rss != '0': + memory_label = str_tools.get_size_label(int(vals.rss)) else: - memory_label = "0" + memory_label = '0' - uptime_label = "" + uptime_label = '' - if self.vals.start_time: + if vals.start_time: if self.is_paused() or not self._is_tor_connected: # freeze the uptime when paused or the tor process is stopped - uptime_label = str_tools.get_short_time_label(self.get_pause_time() - self.vals.start_time) + uptime_label = str_tools.get_short_time_label(self.get_pause_time() - vals.start_time) else: - uptime_label = str_tools.get_short_time_label(time.time() - self.vals.start_time) + uptime_label = str_tools.get_short_time_label(time.time() - vals.start_time) - sys_fields = ((0, "cpu: %s%% tor, %s%% arm" % (self.vals.tor_cpu, self.vals.arm_cpu)), - (27, "mem: %s (%s%%)" % (memory_label, self.vals.memory)), - (47, "pid: %s" % (self.vals.pid if self._is_tor_connected else "")), - (59, "uptime: %s" % uptime_label)) + sys_fields = ((0, 'cpu: %s%% tor, %s%% arm' % (vals.tor_cpu, vals.arm_cpu)), + (27, 'mem: %s (%s%%)' % (memory_label, vals.memory)), + (47, 'pid: %s' % (vals.pid if self._is_tor_connected else '')), + (59, 'uptime: %s' % uptime_label)) for (start, label) in sys_fields: if start + len(label) <= right_width: @@ -274,104 +270,104 @@ class HeaderPanel(panel.Panel, threading.Thread): else: break - if self.vals.or_port: + if vals.or_port: # Line 4 / Line 2 Right (fingerprint, and possibly file descriptor usage) y, x = (1, left_width) if is_wide else (3, 0) - fingerprint_label = ui_tools.crop_str("fingerprint: %s" % self.vals.fingerprint, width) + fingerprint_label = ui_tools.crop_str('fingerprint: %s' % vals.fingerprint, width) self.addstr(y, x, fingerprint_label) # if there's room and we're able to retrieve both the file descriptor # usage and limit then it might be presented - if width - x - 59 >= 20 and self.vals.fd_used and self.vals.fd_limit: + if width - x - 59 >= 20 and vals.fd_used and vals.fd_limit: # display file descriptor usage if we're either configured to do so or # running out - fd_percent = 100 * self.vals.fd_used / self.vals.fd_limit + fd_percent = 100 * vals.fd_used / vals.fd_limit - if fd_percent >= 60 or CONFIG["features.showFdUsage"]: - fd_percentLabel, fd_percent_format = "%i%%" % fd_percent, curses.A_NORMAL + if fd_percent >= 60 or CONFIG['features.showFdUsage']: + fd_percentLabel, fd_percent_format = '%i%%' % fd_percent, curses.A_NORMAL if fd_percent >= 95: - fd_percent_format = curses.A_BOLD | ui_tools.get_color("red") + fd_percent_format = curses.A_BOLD | ui_tools.get_color('red') elif fd_percent >= 90: - fd_percent_format = ui_tools.get_color("red") + fd_percent_format = ui_tools.get_color('red') elif fd_percent >= 60: - fd_percent_format = ui_tools.get_color("yellow") + fd_percent_format = ui_tools.get_color('yellow') - base_label = "file desc: %i / %i (" % (self.vals.fd_used, self.vals.fd_limit) + base_label = 'file desc: %i / %i (' % (vals.fd_used, vals.fd_limit) self.addstr(y, x + 59, base_label) self.addstr(y, x + 59 + len(base_label), fd_percentLabel, fd_percent_format) - self.addstr(y, x + 59 + len(base_label) + len(fd_percentLabel), ")") + self.addstr(y, x + 59 + len(base_label) + len(fd_percentLabel), ')') # Line 5 / Line 3 Left (flags) if self._is_tor_connected: y, x = (2 if is_wide else 4, 0) - self.addstr(y, x, "flags: ") + self.addstr(y, x, 'flags: ') x += 7 - if len(self.vals.flags) > 0: - for i in range(len(self.vals.flags)): - flag = self.vals.flags[i] + if len(vals.flags) > 0: + for i in range(len(vals.flags)): + flag = vals.flags[i] flag_color = CONFIG['attr.flag_colors'].get(flag, 'white') self.addstr(y, x, flag, curses.A_BOLD | ui_tools.get_color(flag_color)) x += len(flag) - if i < len(self.vals.flags) - 1: - self.addstr(y, x, ", ") + if i < len(vals.flags) - 1: + self.addstr(y, x, ', ') x += 2 else: - self.addstr(y, x, "none", curses.A_BOLD | ui_tools.get_color("cyan")) + self.addstr(y, x, 'none', curses.A_BOLD | ui_tools.get_color('cyan')) else: y = 2 if is_wide else 4 status_time = tor_controller().get_latest_heartbeat() - status_time_label = time.strftime("%H:%M %m/%d/%Y", time.localtime(status_time)) - self.addstr(y, 0, "Tor Disconnected", curses.A_BOLD | ui_tools.get_color("red")) - self.addstr(y, 16, " (%s) - press r to reconnect" % status_time_label) + status_time_label = time.strftime('%H:%M %m/%d/%Y', time.localtime(status_time)) + self.addstr(y, 0, 'Tor Disconnected', curses.A_BOLD | ui_tools.get_color('red')) + self.addstr(y, 16, ' (%s) - press r to reconnect' % status_time_label) # Undisplayed / Line 3 Right (exit policy) if is_wide: - exit_policy = self.vals.exit_policy + exit_policy = vals.exit_policy # adds note when default exit policy is appended - if exit_policy == "": - exit_policy = "<default>" - elif not exit_policy.endswith((" *:*", " *")): - exit_policy += ", <default>" + if exit_policy == '': + exit_policy = '<default>' + elif not exit_policy.endswith((' *:*', ' *')): + exit_policy += ', <default>' - self.addstr(2, left_width, "exit policy: ") + self.addstr(2, left_width, 'exit policy: ') x = left_width + 13 # color codes accepts to be green, rejects to be red, and default marker to be cyan is_simple = len(exit_policy) > right_width - 13 - policies = exit_policy.split(", ") + policies = exit_policy.split(', ') for i in range(len(policies)): policy = policies[i].strip() - policy_label = policy.replace("accept", "").replace("reject", "").strip() if is_simple else policy + policy_label = policy.replace('accept', '').replace('reject', '').strip() if is_simple else policy - policy_color = "white" + policy_color = 'white' - if policy.startswith("accept"): - policy_color = "green" - elif policy.startswith("reject"): - policy_color = "red" - elif policy.startswith("<default>"): - policy_color = "cyan" + if policy.startswith('accept'): + policy_color = 'green' + elif policy.startswith('reject'): + policy_color = 'red' + elif policy.startswith('<default>'): + policy_color = 'cyan' self.addstr(2, x, policy_label, curses.A_BOLD | ui_tools.get_color(policy_color)) x += len(policy_label) if i < len(policies) - 1: - self.addstr(2, x, ", ") + self.addstr(2, x, ', ') x += 2 else: # (Client only) Undisplayed / Line 2 Right (new identity option) @@ -382,13 +378,11 @@ class HeaderPanel(panel.Panel, threading.Thread): msg = "press 'n' for a new identity" if newnym_wait > 0: - plural_label = "s" if newnym_wait > 1 else "" - msg = "building circuits, available again in %i second%s" % (newnym_wait, plural_label) + plural_label = 's' if newnym_wait > 1 else '' + msg = 'building circuits, available again in %i second%s' % (newnym_wait, plural_label) self.addstr(1, left_width, msg) - self.vals_lock.release() - def get_pause_time(self): """ Provides the time Tor stopped if it isn't running. Otherwise this is the @@ -433,20 +427,19 @@ class HeaderPanel(panel.Panel, threading.Thread): is_changed = True # TODO: we should decide to redraw or not based on if the sampling values have changed if is_changed or (self.vals and current_time - self.vals.retrieved >= 20): - with self.vals_lock: - self.vals = Sampling(self.vals) + self.vals = Sampling(self.vals) - if self.vals.fd_used and self.vals.fd_limit: - fd_percent = 100 * self.vals.fd_used / self.vals.fd_limit - msg = "Tor's file descriptor usage is at %i%%." % fd_percent + if self.vals.fd_used and self.vals.fd_limit: + fd_percent = 100 * self.vals.fd_used / self.vals.fd_limit + msg = "Tor's file descriptor usage is at %i%%." % fd_percent - if fd_percent >= 90 and not self._is_fd_ninety_percent_warned: - self._is_fd_sixty_percent_warned, self._is_fd_ninety_percent_warned = True, True - msg += " If you run out Tor will be unable to continue functioning." - log.warn(msg) - elif fd_percent >= 60 and not self._is_fd_sixty_percent_warned: - self._is_fd_sixty_percent_warned = True - log.notice(msg) + if fd_percent >= 90 and not self._is_fd_ninety_percent_warned: + self._is_fd_sixty_percent_warned, self._is_fd_ninety_percent_warned = True, True + msg += ' If you run out Tor will be unable to continue functioning.' + log.warn(msg) + elif fd_percent >= 60 and not self._is_fd_sixty_percent_warned: + self._is_fd_sixty_percent_warned = True + log.notice(msg) self.redraw(True) last_draw += 1 @@ -471,8 +464,7 @@ class HeaderPanel(panel.Panel, threading.Thread): self._is_tor_connected = True self._halt_time = None - with self.vals_lock: - self.vals = Sampling(self.vals) + self.vals = Sampling(self.vals) if self.get_height() != initial_height: # We're toggling between being a relay and client, causing the height @@ -487,8 +479,7 @@ class HeaderPanel(panel.Panel, threading.Thread): self._is_tor_connected = False self._halt_time = time.time() - with self.vals_lock: - self.vals = Sampling(self.vals) + self.vals = Sampling(self.vals) self.redraw(True) @@ -525,7 +516,7 @@ class Sampling(object): self.exit_policy = str(controller.get_exit_policy('')) self.flags = self._get_flags(controller) - self.version = str(controller.get_version('Unknown', '')).split()[0] + self.version = str(controller.get_version('Unknown')).split()[0] self.version_status = controller.get_info('status/version/current', 'Unknown') self.pid = controller.get_pid('') [View Less]

1 0

[onionoo/master] Add Example usage section.
by karsten＠torproject.org 29 Jun '14

29 Jun '14

commit 8a7998a71012a844868fa921c0e4919dd9c3b117 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jun 29 16:08:17 2014 +0200 Add Example usage section. Suggested by Runa. --- web/protocol.html | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/web/protocol.html b/web/protocol.html index 1ffaf04..3142880 100644 --- a/web/protocol.html +++ b/web/protocol.html @@ -24,6 +24,7 @@ <li><a … [View More]href="#weights">Weights documents</a></li> <li><a href="#clients">Clients documents</a></li> <li><a href="#uptime">Uptime documents</a></li> + <li><a href="#examples">Example usage</a></li> </ul> </div> @@ -2006,6 +2007,66 @@ The specification of uptime history objects is similar to those in the </div>  +<div class="box"> +<a name="examples"></a> +<h3>Example usage <a href="#examples">#</a> +</h3> + +<p> +The following examples illustrate how to build requests for some trivial +and some more complex use cases. +While Onionoo is designed mainly for developers and not end users, there +may be cases when it's easier to quickly write a specific query Onionoo +rather than to find an Onionoo client that provides the desired +information. +</p> + +<pre>https://onionoo.torproject.org/summary?limit=4</pre> + +<p> +This first query returns the first four summary documents that Onionoo can +find. +The <code>limit</code> parameter should always be used while developing +new queries to avoid downloading huge responses. +</p> + +<pre>https://onionoo.torproject.org/summary?limit=4&search=moria</pre> + +<p> +The second query restricts results to relays and bridges containing the +string "moria" in one of a few searched fields. +</p> + +<pre>https://onionoo.torproject.org/details?limit=4&search=moria</pre> + +<p> +The third query switches from the short summary documents to the longer +details documents containing, well, more details. +</p> + +<pre>https://onionoo.torproject.org/details?limit=4&search=moria&fields=nickname</pre> + +<p> +The fourth query adds the <code>fields</code> parameter which removes all +fields except the specified ones from the result. +This parameter is only implemented for details documents. +</p> + +<pre>https://onionoo.torproject.org/details?limit=4&search=moria&fields=nickname…</pre> + +<p> +The fifth query sorts results by relay consensus weight from largest to +smallest. +</p> + +<p> +Obviously, this query can be made even more complex by adding more +parameters, and in some cases this is necessary and useful. +Please refer to the protocol specification for details. +</p> + +</div>  + </body> </html> [View Less]

1 0

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

29 Jun '14

commit d3a883bba79aee3c2b4a26d54866f8e418200404 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 29 13:45:38 2014 +0000 Update translations for tails-misc --- cs.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cs.po b/cs.po index 69b9be2..5bbace3 100644 --- a/cs.po +++ b/cs.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-06-08 19:08+0200\n" -"PO-… [View More]

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 29 Jun '14

29 Jun '14

commit ef2c74c9f758e933867b1d9b1ae1942cf4c38425 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 29 13:45:03 2014 +0000 Update translations for bridgedb --- cs/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cs/LC_MESSAGES/bridgedb.po b/cs/LC_MESSAGES/bridgedb.po index 11e89fe..09d2633 100644 --- a/cs/LC_MESSAGES/bridgedb.po +++ b/cs/LC_MESSAGES/bridgedb.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-… [View More]

1 0

[metrics-web/master] Fix form actions on new bandwidth page.
by karsten＠torproject.org 29 Jun '14

29 Jun '14

commit 9bba07afce7b1cdb92da6370c8c90f81d3b444ba Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jun 29 14:31:41 2014 +0200 Fix form actions on new bandwidth page. When splitting the Network page into Servers and Bandwidth in 8bda126, form actions have not been updated. Spotted by torland. Fixes #12492. --- website/web/WEB-INF/bandwidth.jsp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/website/web/WEB-INF/… [View More]bandwidth.jsp b/website/web/WEB-INF/bandwidth.jsp index 95d1201..2882236 100644 --- a/website/web/WEB-INF/bandwidth.jsp +++ b/website/web/WEB-INF/bandwidth.jsp @@ -26,7 +26,7 @@ graph shows total advertised bandwidth and bandwidth history of all relays in the network.</p> <img src="bandwidth.png${bandwidth_url}" width="576" height="360" alt="Relay bandwidth graph"> -<form action="network.html#bandwidth"> +<form action="bandwidth.html#bandwidth"> <div class="formrow"> <input type="hidden" name="graph" value="bandwidth"> <p> @@ -55,7 +55,7 @@ Guard flags</a></h3> Exit and/or Guard flags assigned by the directory authorities.</p> <img src="bwhist-flags.png${bwhist_flags_url}" width="576" height="360" alt="Relay bandwidth by flags graph"> -<form action="network.html#bwhist-flags"> +<form action="bandwidth.html#bwhist-flags"> <div class="formrow"> <input type="hidden" name="graph" value="bwhist-flags"> <p> @@ -87,7 +87,7 @@ Note that these sets possibly overlap with relays having both Exit and Guard flag.</p> <img src="bandwidth-flags.png${bandwidth_flags_url}" width="576" height="360" alt="Advertised bandwidth and bandwidth history by relay flags graph"> -<form action="network.html#bandwidth-flags"> +<form action="bandwidth.html#bandwidth-flags"> <div class="formrow"> <input type="hidden" name="graph" value="bandwidth-flags"> <p> @@ -119,7 +119,7 @@ dir bytes are extrapolated from those relays who report them to reflect the number of written and read dir bytes by all relays.</p> <img src="dirbytes.png${dirbytes_url}" width="576" height="360" alt="Dir bytes graph"> -<form action="network.html#dirbytes"> +<form action="bandwidth.html#dirbytes"> <div class="formrow"> <input type="hidden" name="graph" value="dirbytes"> <p> @@ -150,7 +150,7 @@ no sums of advertised bandwidths, but bandwidths of single relays.</p> <img src="advbwdist-perc.png${advbwdist_perc_url}" width="576" height="360" alt="Advertised bandwidth distribution graph"> -<form action="network.html#advbwdist-perc"> +<form action="bandwidth.html#advbwdist-perc"> <div class="formrow"> <input type="hidden" name="graph" value="advbwdist-perc"> <p> @@ -205,7 +205,7 @@ relays in the network.</p> <img src="advbwdist-relay.png${advbwdist_relay_url}" width="576" height="360" alt="Advertised bandwidth of n-th fastest relays graph"> -<form action="network.html#advbwdist-relay"> +<form action="bandwidth.html#advbwdist-relay"> <div class="formrow"> <input type="hidden" name="graph" value="advbwdist-relay"> <p> [View Less]

1 0

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

29 Jun '14

commit 2956e53b99cb51e82d9acd5bbdfd943f8f360307 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 29 13:15:41 2014 +0000 Update translations for tails-misc --- cs.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cs.po b/cs.po index beb5228..69b9be2 100644 --- a/cs.po +++ b/cs.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-06-08 19:08+… [View More]0200\n" -"PO-Revision-Date: 2014-06-28 20:51+0000\n" +"PO-Revision-Date: 2014-06-29 13:11+0000\n" "Last-Translator: mxsedlacek\n" "Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n" "MIME-Version: 1.0\n" @@ -160,9 +160,9 @@ msgstr[2] "Následující vybrané klíče nejsou plně důvěryhodné:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:569 msgid "Do you trust this key enough to use it anyway?" msgid_plural "Do you trust these keys enough to use them anyway?" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Věříte tomuto klíči dostatečně na to, abyste ho přesto použili?" +msgstr[1] "Věříte těmto klíčům dostatečně na to, abyste je přesto použili?" +msgstr[2] "Věříte těmto klíčům dostatečně na to, abyste je přesto použili?" #: config/chroot_local-includes/usr/local/bin/gpgApplet:582 msgid "No keys selected" @@ -172,7 +172,7 @@ msgstr "Nebyly vybrány žádné klíče" msgid "" "You must select a private key to sign the message, or some public keys to " "encrypt the message, or both." -msgstr "" +msgstr "Musíte vybrat soukromý klíč na podepsání nebo veřejný klíč na zašifrování zprávy nebo oba." #: config/chroot_local-includes/usr/local/bin/gpgApplet:612 msgid "No keys available" @@ -181,7 +181,7 @@ msgstr "Žádné dostupné klíče" #: config/chroot_local-includes/usr/local/bin/gpgApplet:614 msgid "" "You need a private key to sign messages or a public key to encrypt messages." -msgstr "" +msgstr "Potřebujete soukromý klíč na podepsání zpráv nebo veřejný klíč na zašifrování zpráv." #: config/chroot_local-includes/usr/local/bin/gpgApplet:742 msgid "GnuPG error" @@ -201,7 +201,7 @@ msgstr "Výstup z GnuPG" #: config/chroot_local-includes/usr/local/bin/gpgApplet:844 msgid "Other messages provided by GnuPG:" -msgstr "" +msgstr "Další zprávy poskytnuté GnuPG:" #: config/chroot_local-includes/usr/local/bin/iceweasel:12 msgid "Tor is not ready" @@ -245,7 +245,7 @@ msgstr "" msgid "" "Build information:\n" "%s" -msgstr "" +msgstr "Buildovací informace:\n%s" #: config/chroot_local-includes/usr/local/bin/tails-about:27 #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1 @@ -256,7 +256,7 @@ msgstr "O Tails" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:128 msgid "Your additional software" -msgstr "" +msgstr "Vaše další programy" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:129 [View Less]

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
122
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2014