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

[arm/master] We ignored the --interface argument if --socket was also provided
by atagar＠torproject.org 23 Jun '14

23 Jun '14

commit 4bb75e2ebc71a4a87bff5e47d6694a7610ae1689 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 21 13:33:34 2014 -0700 We ignored the --interface argument if --socket was also provided When a user specifies an endpoint (either a control port or socket file) we only try to connect to that. However, if a user supplies *both* an --interface and --socket argument then we ignored the former. --- arm/arguments.py | 2 +- arm/starter.py | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/arm/arguments.py b/arm/arguments.py index b527564..136971e 100644 --- a/arm/arguments.py +++ b/arm/arguments.py @@ -8,7 +8,7 @@ import os import arm -import stem.connection +import stem.util.connection from arm.util import tor_controller, msg diff --git a/arm/starter.py b/arm/starter.py index e6db5cf..2131b8c 100644 --- a/arm/starter.py +++ b/arm/starter.py @@ -56,8 +56,16 @@ def main(config): _load_user_armrc(args.config) - control_port = None if args.user_provided_socket else (args.control_address, args.control_port) - control_socket = None if args.user_provided_port else args.control_socket + control_port = (args.control_address, args.control_port) + control_socket = args.control_socket + + # If the user explicitely specified an endpoint then just try to connect to + # that. + + if args.user_provided_socket and not args.user_provided_port: + control_port = None + elif args.user_provided_port and not args.user_provided_socket: + control_socket = None controller = init_controller( control_port = control_port, @@ -96,8 +104,8 @@ def main(config): def _setup_debug_logging(args): """ - Configures us to log at stem's trace level to debug log path, and notes some - general diagnostic information. + Configures us to log at stem's trace level to a debug log path. This starts + it off with some general diagnostic information. """ debug_dir = os.path.dirname(args.debug_path) @@ -251,7 +259,7 @@ def _use_unicode(config): if not config.get('features.printUnicode', True): return - is_lang_unicode = "utf-" in os.getenv("LANG", "").lower() + is_lang_unicode = 'utf-' in os.getenv('LANG', '').lower() if is_lang_unicode and arm.util.ui_tools.is_wide_characters_supported(): locale.setlocale(locale.LC_ALL, '')

1 0

[arm/master] Moving logging functions to a log util
by atagar＠torproject.org 23 Jun '14

23 Jun '14

commit 51cae9c5b64d134cc1c54f65ec6098f6ea2c0125 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 21 14:08:25 2014 -0700 Moving logging functions to a log util Moving our short aliases like debug() and notice() from arm.util to arm.util.log to better namespace them. --- arm/starter.py | 20 ++++++++++---------- arm/util/__init__.py | 42 ++++-------------------------------------- arm/util/log.py | 44 ++++++++++++++++++++++++++++++++++++++++++++ arm/util/tracker.py | 22 +++++++++++----------- arm/util/ui_tools.py | 6 +++--- 5 files changed, 72 insertions(+), 62 deletions(-) diff --git a/arm/starter.py b/arm/starter.py index 2131b8c..ea8e17b 100644 --- a/arm/starter.py +++ b/arm/starter.py @@ -25,7 +25,7 @@ import stem import stem.util.log import stem.util.system -from arm.util import BASE_DIR, init_controller, msg, trace, info, notice, warn, uses_settings +from arm.util import log, BASE_DIR, init_controller, msg, uses_settings @uses_settings @@ -132,7 +132,7 @@ def _setup_debug_logging(args): except IOError as exc: armrc_content = "[unable to read file: %s]" % exc.strerror - trace( + log.trace( 'debug.header', arm_version = arm.__version__, stem_version = stem.__version__, @@ -160,14 +160,14 @@ def _load_user_armrc(path, config): chroot = config.get('tor.chroot', '').strip().rstrip(os.path.sep) if chroot and not os.path.exists(chroot): - notice('setup.chroot_doesnt_exist', path = chroot) + log.notice('setup.chroot_doesnt_exist', path = chroot) config.set('tor.chroot', '') else: config.set('tor.chroot', chroot) # use the normalized path except IOError as exc: - warn('config.unable_to_read_file', error = exc.strerror) + log.warn('config.unable_to_read_file', error = exc.strerror) else: - notice('config.nothing_loaded', path = path) + log.notice('config.nothing_loaded', path = path) def _warn_if_root(controller): @@ -178,10 +178,10 @@ def _warn_if_root(controller): tor_user = controller.get_user(None) if tor_user == 'root': - notice('setup.tor_is_running_as_root') + log.notice('setup.tor_is_running_as_root') elif os.getuid() == 0: tor_user = tor_user if tor_user else '<tor user>' - notice('setup.arm_is_running_as_root', tor_user = tor_user) + log.notice('setup.arm_is_running_as_root', tor_user = tor_user) def _warn_if_unable_to_get_pid(controller): @@ -193,7 +193,7 @@ def _warn_if_unable_to_get_pid(controller): try: controller.get_pid() except ValueError: - warn('setup.unable_to_determine_pid') + log.warn('setup.unable_to_determine_pid') @uses_settings @@ -206,7 +206,7 @@ def _setup_freebsd_chroot(controller, config): jail_chroot = stem.util.system.get_bsd_jail_path(controller.get_pid(0)) if jail_chroot and os.path.exists(jail_chroot): - info('setup.set_freebsd_chroot', path = jail_chroot) + log.info('setup.set_freebsd_chroot', path = jail_chroot) config.set('tor.chroot', jail_chroot) @@ -218,7 +218,7 @@ def _notify_of_unknown_events(): missing_events = arm.arguments.missing_event_types() if missing_events: - info('setup.unknown_event_types', event_types = ', '.join(missing_events)) + log.info('setup.unknown_event_types', event_types = ', '.join(missing_events)) @uses_settings diff --git a/arm/util/__init__.py b/arm/util/__init__.py index 3853b3d..de40170 100644 --- a/arm/util/__init__.py +++ b/arm/util/__init__.py @@ -4,6 +4,7 @@ safely working with curses (hiding some of the gory details). """ __all__ = [ + 'log', 'panel', 'text_input', 'tor_config', @@ -16,7 +17,8 @@ import sys import stem.connection import stem.util.conf -import stem.util.log + +from arm.util import log TOR_CONTROLLER = None BASE_DIR = os.path.sep.join(__file__.split(os.path.sep)[:-2]) @@ -65,41 +67,5 @@ def msg(message, config, **attr): try: return config.get('msg.%s' % message).format(**attr) except: - notice('BUG: We attempted to use an undefined string resource (%s)' % message) + log.notice('BUG: We attempted to use an undefined string resource (%s)' % message) return '' - - -def trace(msg, **attr): - _log(stem.util.log.TRACE, msg, **attr) - - -def debug(msg, **attr): - _log(stem.util.log.DEBUG, msg, **attr) - - -def info(msg, **attr): - _log(stem.util.log.INFO, msg, **attr) - - -def notice(msg, **attr): - _log(stem.util.log.NOTICE, msg, **attr) - - -def warn(msg, **attr): - _log(stem.util.log.WARN, msg, **attr) - - -def error(msg, **attr): - _log(stem.util.log.ERROR, msg, **attr) - - -def _log(runlevel, message, **attr): - """ - Logs the given message, formatted with optional attributes. - - :param stem.util.log.Runlevel runlevel: runlevel at which to log the message - :param str message: message handle to log - :param dict attr: attributes to format the message with - """ - - stem.util.log.log(runlevel, msg(message, **attr)) diff --git a/arm/util/log.py b/arm/util/log.py new file mode 100644 index 0000000..72c1d9d --- /dev/null +++ b/arm/util/log.py @@ -0,0 +1,44 @@ +""" +Logging utilities, primiarily short aliases for logging a message at various +runlevels. +""" + +import stem.util.log + +import arm.util + + +def trace(msg, **attr): + _log(stem.util.log.TRACE, msg, **attr) + + +def debug(msg, **attr): + _log(stem.util.log.DEBUG, msg, **attr) + + +def info(msg, **attr): + _log(stem.util.log.INFO, msg, **attr) + + +def notice(msg, **attr): + _log(stem.util.log.NOTICE, msg, **attr) + + +def warn(msg, **attr): + _log(stem.util.log.WARN, msg, **attr) + + +def error(msg, **attr): + _log(stem.util.log.ERROR, msg, **attr) + + +def _log(runlevel, message, **attr): + """ + Logs the given message, formatted with optional attributes. + + :param stem.util.log.Runlevel runlevel: runlevel at which to log the message + :param str message: message handle to log + :param dict attr: attributes to format the message with + """ + + stem.util.log.log(runlevel, arm.util.msg(message, **attr)) diff --git a/arm/util/tracker.py b/arm/util/tracker.py index a10d291..e5d819d 100644 --- a/arm/util/tracker.py +++ b/arm/util/tracker.py @@ -42,7 +42,7 @@ import threading from stem.control import State from stem.util import conf, connection, proc, str_tools, system -from arm.util import tor_controller, debug, info, notice +from arm.util import log, tor_controller CONFIG = conf.config_dict('arm', { 'queries.connections.rate': 5, @@ -459,13 +459,13 @@ class ConnectionTracker(Daemon): min_rate += 1 # little extra padding so we don't frequently update this self.set_rate(min_rate) self._rate_too_low_count = 0 - debug('tracker.lookup_rate_increased', seconds = "%0.1f" % min_rate) + log.debug('tracker.lookup_rate_increased', seconds = "%0.1f" % min_rate) else: self._rate_too_low_count = 0 return True except IOError as exc: - info('wrap', text = exc) + log.info('wrap', text = exc) # Fail over to another resolver if we've repeatedly been unable to use # this one. @@ -478,13 +478,13 @@ class ConnectionTracker(Daemon): self._failure_count = 0 if self._resolvers: - notice( + log.notice( 'tracker.unable_to_use_resolver', old_resolver = resolver, new_resolver = self._resolvers[0], ) else: - notice('tracker.unable_to_use_all_resolvers') + log.notice('tracker.unable_to_use_all_resolvers') return False @@ -576,19 +576,19 @@ class ResourceTracker(Daemon): self._use_proc = False self._failure_count = 0 - info( + log.info( 'tracker.abort_getting_resources', resolver = 'proc', response = 'falling back to ps', exc = exc, ) else: - debug('tracker.unable_to_get_resources', resolver = 'proc', exc = exc) + log.debug('tracker.unable_to_get_resources', resolver = 'proc', exc = exc) else: if self._failure_count >= 3: # Give up on further attempts. - info( + log.info( 'tracker.abort_getting_resources', resolver = 'ps', response = 'giving up on getting resource usage information', @@ -597,7 +597,7 @@ class ResourceTracker(Daemon): self.stop() else: - debug('tracker.unable_to_get_resources', resolver = 'ps', exc = exc) + log.debug('tracker.unable_to_get_resources', resolver = 'ps', exc = exc) return False @@ -654,9 +654,9 @@ class PortUsageTracker(Daemon): self._failure_count += 1 if self._failure_count >= 3: - info('tracker.abort_getting_port_usage', exc = exc) + log.info('tracker.abort_getting_port_usage', exc = exc) self.stop() else: - debug('tracker.unable_to_get_port_usages', exc = exc) + log.debug('tracker.unable_to_get_port_usages', exc = exc) return False diff --git a/arm/util/ui_tools.py b/arm/util/ui_tools.py index 2b24b83..01daffa 100644 --- a/arm/util/ui_tools.py +++ b/arm/util/ui_tools.py @@ -7,7 +7,7 @@ import curses from curses.ascii import isprint -from arm.util import info, msg +from arm.util import log, msg from stem.util import conf, enum, system @@ -137,10 +137,10 @@ def _color_attr(): curses.init_pair(color_pair + 1, foreground_color, background_color) color_attr[color_name] = curses.color_pair(color_pair + 1) - info('setup.color_support_available') + log.info('setup.color_support_available') COLOR_ATTR = color_attr else: - info('setup.color_support_unavailable') + log.info('setup.color_support_unavailable') COLOR_ATTR = DEFAULT_COLOR_ATTR return COLOR_ATTR

1 0

[arm/master] Show proper class hierarchy for the tracker module
by atagar＠torproject.org 23 Jun '14

23 Jun '14

commit 4177c86b1f730f0035a67234760ebd3ff9ddbaa5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 21 14:32:59 2014 -0700 Show proper class hierarchy for the tracker module Our header's supposed to show inheritance. Also we were missing our PortUsageTracker class. --- arm/util/tracker.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/arm/util/tracker.py b/arm/util/tracker.py index e5d819d..8b06042 100644 --- a/arm/util/tracker.py +++ b/arm/util/tracker.py @@ -9,20 +9,23 @@ Background tasks for gathering information about the tor process. stop_trackers - halts any active trackers Daemon - common parent for resolvers + |- ConnectionTracker - periodically checks the connections established by tor + | |- get_custom_resolver - provide the custom conntion resolver we're using + | |- set_custom_resolver - overwrites automatic resolver selecion with a custom resolver + | +- get_connections - provides our latest connection results + | + |- ResourceTracker - periodically checks the resource usage of tor + | +- get_resource_usage - provides our latest resource usage results + | + |- PortUsageTracker - provides information about port usage on the local system + | +- get_processes_using_ports - mapping of ports to the processes using it + | |- run_counter - number of successful runs |- get_rate - provides the rate at which we run |- set_rate - sets the rate at which we run |- set_paused - pauses or continues work +- stop - stops further work by the daemon - ConnectionTracker - periodically checks the connections established by tor - |- get_custom_resolver - provide the custom conntion resolver we're using - |- set_custom_resolver - overwrites automatic resolver selecion with a custom resolver - +- get_connections - provides our latest connection results - - ResourceTracker - periodically checks the resource usage of tor - +- get_resource_usage - provides our latest resource usage results - .. data:: Resources Resource usage information retrieved about the tor process.

1 0

[arm/master] Moving header panel sampling to its own class
by atagar＠torproject.org 23 Jun '14

23 Jun '14

commit 08b684bdc3cb405e0993c62e8c06ba7600ca8220 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 22 16:02:25 2014 -0700 Moving header panel sampling to its own class Our header panel is a daemon thread that periodically pulls stats, rending the last result whenever redrawn. We've changed what we use for sampling a few times. First it was a dictionary, then a named tuple. Now I'm making the sampling its own class. This greatly helps split the model and view functionality. --- arm/controller.py | 5 +- arm/header_panel.py | 306 +++++++++++++++++++++------------------------------ 2 files changed, 125 insertions(+), 186 deletions(-) diff --git a/arm/controller.py b/arm/controller.py index e1c3991..f18af9c 100644 --- a/arm/controller.py +++ b/arm/controller.py @@ -586,8 +586,7 @@ def start_arm(stdscr): stdscr - curses window """ - start_time = CONFIG['start_time'] - init_controller(stdscr, start_time) + init_controller(stdscr, CONFIG['start_time']) control = get_controller() if not CONFIG["features.acsSupport"]: @@ -619,7 +618,7 @@ def start_arm(stdscr): # logs the initialization time - log.info("arm started (initialization took %0.3f seconds)" % (time.time() - start_time)) + log.info("arm started (initialization took %0.3f seconds)" % (time.time() - CONFIG['start_time'])) # main draw loop diff --git a/arm/header_panel.py b/arm/header_panel.py index 41992e4..9bbd211 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -6,15 +6,16 @@ available. import os import time -import collections import curses import threading import arm.util.tracker -from stem import Signal +import stem +import stem.util.system + from stem.control import Listener, State -from stem.util import conf, log, proc, str_tools, system +from stem.util import conf, log, proc, str_tools import arm.starter import arm.popups @@ -30,38 +31,6 @@ CONFIG = conf.config_dict('arm', { 'features.showFdUsage': False, }) -Sampling = collections.namedtuple('Sampling', [ - 'address', - 'fingerprint', - 'nickname', - 'or_address', - 'or_port', - 'dir_port', - - 'control_port', - 'socket_path', - 'is_password_auth', - 'is_cookie_auth', - - 'exit_policy', - 'flags', - 'version', - 'version_status', - - 'pid', - 'start_time', - 'fd_limit', - 'fd_used', - - 'tor_cpu', - 'arm_cpu', - 'rss', - 'memory', - 'hostname', - 'os_name', - 'os_version', -]) - class HeaderPanel(panel.Panel, threading.Thread): """ @@ -74,7 +43,6 @@ class HeaderPanel(panel.Panel, threading.Thread): self.setDaemon(True) self._is_tor_connected = tor_controller().is_alive() - self._last_update = -1 # time the content was last revised self._halt = False # terminates thread if true self._cond = threading.Condition() # used for pausing the thread @@ -83,25 +51,6 @@ class HeaderPanel(panel.Panel, threading.Thread): self._halt_time = None - # The last arm cpu usage sampling taken. This is a tuple of the form: - # (total arm cpu time, sampling timestamp) - # - # The initial cpu total should be zero. However, at startup the cpu time - # in practice is often greater than the real time causing the initially - # reported cpu usage to be over 100% (which shouldn't be possible on - # single core systems). - # - # Setting the initial cpu total to the value at this panel's init tends to - # give smoother results (staying in the same ballpark as the second - # sampling) so fudging the numbers this way for now. - - self._arm_cpu_sampling = (sum(os.times()[:3]), start_time) - - # Last sampling received from the ResourceTracker, used to detect when it - # changes. - - self._last_resource_fetch = -1 - # flag to indicate if we've already given file descriptor warnings self._is_fd_sixty_percent_warned = False @@ -111,7 +60,7 @@ class HeaderPanel(panel.Panel, threading.Thread): self.vals_lock = threading.RLock() with self.vals_lock: - self.vals = self._get_attributes() + self.vals = Sampling() # listens for tor reload (sighup) events @@ -135,7 +84,7 @@ class HeaderPanel(panel.Panel, threading.Thread): Requests a new identity and provides a visual queue. """ - tor_controller().signal(Signal.NEWNYM) + tor_controller().signal(stem.Signal.NEWNYM) # If we're wide then the newnym label in this panel will give an # indication that the signal was sent. Otherwise use a msg. @@ -479,12 +428,25 @@ class HeaderPanel(panel.Panel, threading.Thread): is_changed = False if self.vals.pid: - resource_tracker = arm.util.tracker.get_resource_tracker() - is_changed = self._last_resource_fetch != resource_tracker.run_counter() + #resource_tracker = arm.util.tracker.get_resource_tracker() + #is_changed = self._last_resource_fetch != resource_tracker.run_counter() + is_changed = True # TODO: we should decide to redraw or not based on if the sampling values have changed - if is_changed or current_time - self._last_update >= 20: + if is_changed or (self.vals and current_time - self.vals.retrieved >= 20): with self.vals_lock: - self.vals = self._get_attributes() + 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 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 @@ -510,7 +472,7 @@ class HeaderPanel(panel.Panel, threading.Thread): self._halt_time = None with self.vals_lock: - self.vals = self._get_attributes() + self.vals = Sampling(self.vals) if self.get_height() != initial_height: # We're toggling between being a relay and client, causing the height @@ -526,140 +488,118 @@ class HeaderPanel(panel.Panel, threading.Thread): self._halt_time = time.time() with self.vals_lock: - self.vals = self._get_attributes() + self.vals = Sampling(self.vals) self.redraw(True) - def _get_attributes(self): + +class Sampling(object): + """ + Statistical information rendered by the header panel. + """ + + def __init__(self, last_sampling = None): controller = tor_controller() or_listeners = controller.get_listeners(Listener.OR, []) + fd_limit = controller.get_info('process/descriptor-limit', '-1') - if not or_listeners: - or_address, or_port = '', '' - else: - # TODO: Relays can bind to multiple ports to listen for OR connections. - # Not sure how we'd like to surface that... + uname_vals = os.uname() + start_time = stem.util.system.get_start_time(controller.get_pid(None)) + tor_resources = arm.util.tracker.get_resource_tracker().get_resource_usage() + + self.retrieved = time.time() + self.arm_total_cpu_time = sum(os.times()[:3]) + + self.address = controller.get_info('address', '') + self.fingerprint = controller.get_info('fingerprint', 'Unknown') + self.nickname = controller.get_conf('Nickname', '') + self.or_address = or_listeners[0][0] if or_listeners else '' + self.or_port = or_listeners[0][1] if or_listeners else '' + self.dir_port = controller.get_conf('DirPort', '0') + + self.control_port = controller.get_conf('ControlPort', '0') + self.socket_path = controller.get_conf('ControlSocket', '') + self.is_password_auth = controller.get_conf('HashedControlPassword', None) is not None + self.is_cookie_auth = controller.get_conf('CookieAuthentication', None) == '1' + + 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_status = controller.get_info('status/version/current', 'Unknown') + + self.pid = controller.get_pid('') + self.start_time = start_time if start_time else '' + self.fd_limit = int(fd_limit) if fd_limit.isdigit() else None + self.fd_used = self._get_fd_used(controller.get_pid(None)) if self.fd_limit else 0 + + self.tor_cpu = '%0.1f' % (100 * tor_resources.cpu_sample) + self.arm_cpu = '%0.1f' % (100 * self._get_cpu_percentage(last_sampling)) + self.rss = str(tor_resources.memory_bytes) + self.memory = '%0.1f' % (100 * tor_resources.memory_percent) + self.hostname = uname_vals[1] + self.os_name = uname_vals[0] + self.os_version = uname_vals[2] + + def _get_fd_used(self, pid): + """ + Provides the number of file descriptors currently being used by this + process. - or_address, or_port = or_listeners[0] + :param int pid: process id to look up - # file descriptor limit for the process, if this can't be determined - # then the limit is None + :returns: **int** of the number of file descriptors used, **None** if this + can't be determined + """ - fd_limit = controller.get_info('process/descriptor-limit', '-1') + # The file descriptor usage is the size of the '/proc/<pid>/fd' contents... + # + # http://linuxshellaccount.blogspot.com/2008/06/finding-number-of-open-file-d… + # + # I'm not sure about other platforms (like BSD) so erroring out there. - if fd_limit != '-1' and fd_limit.isdigit(): - fd_limit = int(fd_limit) - else: - fd_limit = None + if pid and proc.is_available(): + try: + return len(os.listdir('/proc/%s/fd' % pid)) + except: + pass - uname_vals = os.uname() + return None - try: - start_time = system.get_start_time(controller.get_pid()) - except: - start_time = None - - flags = [] - my_fingerprint = controller.get_info('fingerprint', None) - - if my_fingerprint: - my_status_entry = controller.get_network_status(my_fingerprint) - - if my_status_entry: - flags = my_status_entry.flags - - # Updates file descriptor usage and logs if the usage is high. If we don't - # have a known limit or it's obviously faulty (being lower than our - # current usage) then omit file descriptor functionality. - - fd_used = 0 - - if fd_limit: - fd_used = get_file_descriptor_usage(controller.get_pid(None)) - - if not fd_used or fd_used > fd_limit: - fd_used = 0 - - if fd_used and fd_limit: - fd_percent = 100 * fd_used / 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) - - resource_tracker = arm.util.tracker.get_resource_tracker() - - resources = resource_tracker.get_resource_usage() - self._last_resource_fetch = resource_tracker.run_counter() - - tor_cpu = '%0.1f' % (100 * resources.cpu_sample) - tor_rss = str(resources.memory_bytes) - tor_memory = '%0.1f' % (100 * resources.memory_percent) - - # determines the cpu time for the arm process (including user and system - # time of both the primary and child processes) - - total_arm_cpu_time, current_time = sum(os.times()[:3]), time.time() - arm_cpu_telta = total_arm_cpu_time - self._arm_cpu_sampling[0] - arm_time_delta = current_time - self._arm_cpu_sampling[1] - python_cpu_time = arm_cpu_telta / arm_time_delta - sys_call_cpu_time = 0.0 # TODO: add a wrapper around call() to get this - arm_cpu = '%0.1f' % (100 * (python_cpu_time + sys_call_cpu_time)) - self._arm_cpu_sampling = (total_arm_cpu_time, current_time) - - self._last_update = current_time - - return Sampling( - address = controller.get_info('address', ''), - fingerprint = controller.get_info('fingerprint', 'Unknown'), - nickname = controller.get_conf('Nickname', ''), - or_address = or_address, - or_port = or_port, - dir_port = controller.get_conf('DirPort', '0'), - - control_port = controller.get_conf('ControlPort', '0'), - socket_path = controller.get_conf('ControlSocket', ''), - is_password_auth = controller.get_conf('HashedControlPassword', None) is not None, - is_cookie_auth = controller.get_conf('CookieAuthentication', None) == '1', - - exit_policy = str(controller.get_exit_policy()), - flags = flags, - version = str(controller.get_version('Unknown')).split()[0], - version_status = controller.get_info('status/version/current', 'Unknown'), - - pid = controller.get_pid(''), - start_time = start_time if start_time else '', - fd_limit = fd_limit, - fd_used = fd_used, - - tor_cpu = tor_cpu, - arm_cpu = arm_cpu, - rss = tor_rss, - memory = tor_memory, - hostname = uname_vals[1], - os_name = uname_vals[0], - os_version = uname_vals[2], - ) - - -def get_file_descriptor_usage(pid): - """ - Provides the number of file descriptors currently being used by this - process. This returns None if this can't be determined. - """ + def _get_flags(self, controller): + """ + Provides the flags held by our relay. This is an empty list if it can't be + determined, likely because we don't have our own router status entry yet. - # The file descriptor usage is the size of the '/proc/<pid>/fd' contents - # http://linuxshellaccount.blogspot.com/2008/06/finding-number-of-open-file-d… - # I'm not sure about other platforms (like BSD) so erroring out there. + :param stem.control.Controller controller: tor control connection + + :returns: **list** with the relays held by our relay + """ - if pid and proc.is_available(): try: - return len(os.listdir('/proc/%s/fd' % pid)) - except: - return None + my_fingerprint = controller.get_info('fingerprint') + return controller.get_network_status(my_fingerprint).flags + except stem.ControllerError: + return [] + + def _get_cpu_percentage(self, last_sampling): + """ + Determine the cpu usage of our own process since the last sampling. + + :param arm.header_panel.Sampling last_sampling: sampling for which to + provide a CPU usage delta with + + :returns: **float** representation for our cpu usage over the given period + of time + """ + + if last_sampling: + arm_cpu_delta = self.arm_total_cpu_time - last_sampling.arm_total_cpu_time + arm_time_delta = self.retrieved - last_sampling.retrieved + + python_cpu_time = arm_cpu_delta / arm_time_delta + sys_call_cpu_time = 0.0 # TODO: add a wrapper around call() to get this + + return python_cpu_time + sys_call_cpu_time + else: + return 0.0

1 0

[arm/master] Renaming tracker's get_resource_usage() and get_connections() to get_value()
by atagar＠torproject.org 23 Jun '14

23 Jun '14

commit c109e00ecb066f8e5c6539359d5d969afc35ae56 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 22 19:05:13 2014 -0700 Renaming tracker's get_resource_usage() and get_connections() to get_value() We use singletons to fetch trackers, so their type is already pretty obvious. Changing their method names to something more generic so it doesn't sound so redundant. --- arm/connections/conn_panel.py | 2 +- arm/graphing/conn_stats.py | 2 +- arm/graphing/resource_stats.py | 2 +- arm/header_panel.py | 2 +- arm/util/tracker.py | 9 +++++---- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/arm/connections/conn_panel.py b/arm/connections/conn_panel.py index fe9b5a6..491c810 100644 --- a/arm/connections/conn_panel.py +++ b/arm/connections/conn_panel.py @@ -517,7 +517,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): # new_connections [(local ip, local port, foreign ip, foreign port)...] # new_circuits {circuit_id => (status, purpose, path)...} - new_connections = [(conn.local_address, conn.local_port, conn.remote_address, conn.remote_port) for conn in conn_resolver.get_connections()] + new_connections = [(conn.local_address, conn.local_port, conn.remote_address, conn.remote_port) for conn in conn_resolver.get_value()] new_circuits = {} for circ in tor_controller().get_circuits(): diff --git a/arm/graphing/conn_stats.py b/arm/graphing/conn_stats.py index 5e2d2f5..2f8ec11 100644 --- a/arm/graphing/conn_stats.py +++ b/arm/graphing/conn_stats.py @@ -45,7 +45,7 @@ class ConnStats(graph_panel.GraphStats): inbound_count, outbound_count = 0, 0 - for entry in arm.util.tracker.get_connection_tracker().get_connections(): + for entry in arm.util.tracker.get_connection_tracker().get_value(): local_port = entry.local_port if local_port in (self.or_port, self.dir_port): diff --git a/arm/graphing/resource_stats.py b/arm/graphing/resource_stats.py index 71b6790..856c2b7 100644 --- a/arm/graphing/resource_stats.py +++ b/arm/graphing/resource_stats.py @@ -54,7 +54,7 @@ class ResourceStats(graph_panel.GraphStats): resource_tracker = arm.util.tracker.get_resource_tracker() if resource_tracker and resource_tracker.run_counter() != self.last_counter: - resources = resource_tracker.get_resource_usage() + resources = resource_tracker.get_value() self.last_counter = resource_tracker.run_counter() primary = resources.cpu_sample * 100 # decimal percentage to whole numbers secondary = resources.memory_bytes / 1048576 # translate size to MB so axis labels are short diff --git a/arm/header_panel.py b/arm/header_panel.py index 9bbd211..5f382c3 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -506,7 +506,7 @@ class Sampling(object): uname_vals = os.uname() start_time = stem.util.system.get_start_time(controller.get_pid(None)) - tor_resources = arm.util.tracker.get_resource_tracker().get_resource_usage() + tor_resources = arm.util.tracker.get_resource_tracker().get_value() self.retrieved = time.time() self.arm_total_cpu_time = sum(os.times()[:3]) diff --git a/arm/util/tracker.py b/arm/util/tracker.py index 8b06042..02b1943 100644 --- a/arm/util/tracker.py +++ b/arm/util/tracker.py @@ -5,6 +5,7 @@ Background tasks for gathering information about the tor process. get_connection_tracker - provides a ConnectionTracker for our tor process get_resource_tracker - provides a ResourceTracker for our tor process + get_port_usage_tracker - provides a PortUsageTracker for our system stop_trackers - halts any active trackers @@ -12,10 +13,10 @@ Background tasks for gathering information about the tor process. |- ConnectionTracker - periodically checks the connections established by tor | |- get_custom_resolver - provide the custom conntion resolver we're using | |- set_custom_resolver - overwrites automatic resolver selecion with a custom resolver - | +- get_connections - provides our latest connection results + | +- get_value - provides our latest connection results | |- ResourceTracker - periodically checks the resource usage of tor - | +- get_resource_usage - provides our latest resource usage results + | +- get_value - provides our latest resource usage results | |- PortUsageTracker - provides information about port usage on the local system | +- get_processes_using_ports - mapping of ports to the processes using it @@ -511,7 +512,7 @@ class ConnectionTracker(Daemon): self._custom_resolver = resolver - def get_connections(self): + def get_value(self): """ Provides a listing of tor's latest connections. @@ -537,7 +538,7 @@ class ResourceTracker(Daemon): self._use_proc = proc.is_available() # determines if we use proc or ps for lookups self._failure_count = 0 # number of times in a row we've failed to get results - def get_resource_usage(self): + def get_value(self): """ Provides tor's latest resource usage.

1 0

[stem/master] Using CollecTor for the @type annotations as well
by atagar＠torproject.org 23 Jun '14

23 Jun '14

commit 6a325a7d1eccd9c4f8a55d8664ab564c2ebe326a Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jun 23 07:59:47 2014 -0700 Using CollecTor for the @type annotations as well Karsten points out that the CollecTor actually does have all the @type annotationns. This drops our last reference to metrics.torproject.org. --- stem/control.py | 2 +- stem/descriptor/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/control.py b/stem/control.py index 30cb1b8..b8cff59 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1252,7 +1252,7 @@ class Controller(BaseController): :param object default: response if the query fails - :returns: int with our process' pid + :returns: **int** for tor's pid :raises: **ValueError** if unable to determine the pid and no default was provided diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 887ab5b..7c6eede 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -130,7 +130,7 @@ def parse_file(descriptor_file, descriptor_type = None, validate = True, documen my_descriptor_file = open(descriptor_path, 'rb') :param str,file,tarfile descriptor_file: path or opened file with the descriptor contents - :param str descriptor_type: `descriptor type <https://metrics.torproject.org/formats.html#descriptortypes>`_, this is guessed if not provided + :param str descriptor_type: `descriptor type <https://collector.torproject.org/formats.html>`_, this is guessed if not provided :param bool validate: checks the validity of the descriptor's content if **True**, skips these checks otherwise :param stem.descriptor.__init__.DocumentHandler document_handler: method in

1 0

[stem/master] Minor hierarchy doc revisions
by atagar＠torproject.org 23 Jun '14

23 Jun '14

commit 7f6822e6860ee75cc9a431aca30fdec785df51db Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 21 15:01:20 2014 -0700 Minor hierarchy doc revisions Just a few very minor corrections for our docs. --- stem/descriptor/extrainfo_descriptor.py | 4 ++-- stem/descriptor/tordnsel.py | 4 ++++ stem/exit_policy.py | 5 ++++- stem/interpreter/__init__.py | 7 ++++++- stem/response/__init__.py | 4 ++-- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 7d562d6..5f1a974 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -29,8 +29,8 @@ Extra-info descriptors are available from a few sources... :: ExtraInfoDescriptor - Tor extra-info descriptor. - | |- RelayExtraInfoDescriptor - Extra-info descriptor for a relay. - | +- BridgeExtraInfoDescriptor - Extra-info descriptor for a bridge. + |- RelayExtraInfoDescriptor - Extra-info descriptor for a relay. + |- BridgeExtraInfoDescriptor - Extra-info descriptor for a bridge. | |- digest - calculates the upper-case hex digest value for our content +- get_unrecognized_lines - lines with unrecognized content diff --git a/stem/descriptor/tordnsel.py b/stem/descriptor/tordnsel.py index 07e6af4..b00edff 100644 --- a/stem/descriptor/tordnsel.py +++ b/stem/descriptor/tordnsel.py @@ -4,6 +4,10 @@ """ Parsing for `TorDNSEL <https://www.torproject.org/projects/tordnsel.html.en>`_ exit list files. + +:: + + TorDNSEL - Exit list provided by TorDNSEL """ import datetime diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 7f1c052..2051995 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -25,7 +25,8 @@ exiting to a destination is permissible or not. For instance... :: ExitPolicy - Exit policy for a Tor relay - | + MicroExitPolicy - Microdescriptor exit policy + |- MicroExitPolicy - Microdescriptor exit policy + | |- can_exit_to - check if exiting to this destination is allowed or not |- is_exiting_allowed - check if any exiting is allowed |- summary - provides a short label, similar to a microdescriptor @@ -33,6 +34,8 @@ exiting to a destination is permissible or not. For instance... +- __iter__ - ExitPolicyRule entries that this contains ExitPolicyRule - Single rule of an exit policy chain + |- MicroExitPolicyRule - Single rule for a microdescriptor policy + | |- is_address_wildcard - checks if we'll accept any address |- is_port_wildcard - checks if we'll accept any port |- get_address_type - provides the protocol our ip address belongs to diff --git a/stem/interpreter/__init__.py b/stem/interpreter/__init__.py index 18c536e..a296163 100644 --- a/stem/interpreter/__init__.py +++ b/stem/interpreter/__init__.py @@ -6,7 +6,12 @@ Interactive interpreter for interacting with Tor directly. This adds usability features such as tab completion, history, and IRC-style functions (like /help). """ -__all__ = ['arguments', 'autocomplete', 'commands', 'help', 'msg'] +__all__ = [ + 'arguments', + 'autocomplete', + 'commands', + 'help', +] import os import sys diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 98684f7..8585ac4 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -11,6 +11,8 @@ Parses replies from the control socket. convert - translates a ControlMessage into a particular response subclass ControlMessage - Message that's read from the control socket. + |- SingleLineResponse - Simple tor response only including a single line of information. + | |- from_str - provides a ControlMessage for the given string |- is_ok - response had a 250 status |- content - provides the parsed message content @@ -26,8 +28,6 @@ Parses replies from the control socket. |- peek_key - provides the key of the next entry |- pop - removes and returns the next entry +- pop_mapping - removes and returns the next entry as a KEY=VALUE mapping - - SingleLineResponse - Simple tor response only including a single line of information. """ __all__ = [

1 0

[stem/master] Interpretor ignored the --interface argument if --socket was also provided
by atagar＠torproject.org 23 Jun '14

23 Jun '14

commit c1308b33d026ba3c67f43008f992527bb7ffcaa5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 21 13:30:41 2014 -0700 Interpretor ignored the --interface argument if --socket was also provided When a user specifies an endpoint (either a control port or socket file) we only try to connect to that. However, if a user supplies *both* an --interface and --socket argument then we ignored the former. --- stem/interpreter/__init__.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/stem/interpreter/__init__.py b/stem/interpreter/__init__.py index 31b119f..18c536e 100644 --- a/stem/interpreter/__init__.py +++ b/stem/interpreter/__init__.py @@ -83,8 +83,16 @@ def main(): take_ownership = True, ) - control_port = None if args.user_provided_socket else (args.control_address, args.control_port) - control_socket = None if args.user_provided_port else args.control_socket + control_port = (args.control_address, args.control_port) + control_socket = args.control_socket + + # If the user explicitely specified an endpoint then just try to connect to + # that. + + if args.user_provided_socket and not args.user_provided_port: + control_port = None + elif args.user_provided_port and not args.user_provided_socket: + control_socket = None controller = stem.connection.connect( control_port = control_port,

1 0

[stem/master] Changing version module's quote types
by atagar＠torproject.org 23 Jun '14

23 Jun '14

commit e1e7f31a361af7553b3e0336385d38f388cc67ee Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 22 18:52:58 2014 -0700 Changing version module's quote types A while back I standardized stem on using single quotes but looks like I missed the version module. --- stem/version.py | 82 +++++++++++++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/stem/version.py b/stem/version.py index 791ce7b..a772e7c 100644 --- a/stem/version.py +++ b/stem/version.py @@ -78,7 +78,7 @@ except ImportError: VERSION_CACHE = {} -def get_system_tor_version(tor_cmd = "tor"): +def get_system_tor_version(tor_cmd = 'tor'): """ Queries tor for its version. This is os dependent, only working on linux, osx, and bsd. @@ -91,14 +91,14 @@ def get_system_tor_version(tor_cmd = "tor"): """ if not tor_cmd in VERSION_CACHE: - version_cmd = "%s --version" % tor_cmd + version_cmd = '%s --version' % tor_cmd try: version_output = stem.util.system.call(version_cmd) except OSError as exc: # make the error message nicer if this is due to tor being unavialable - if "No such file or directory" in str(exc): + if 'No such file or directory' in str(exc): if os.path.isabs(tor_cmd): exc = "Unable to check tor's version. '%s' doesn't exist." % tor_cmd else: @@ -113,7 +113,7 @@ def get_system_tor_version(tor_cmd = "tor"): last_line = version_output[-1] - if last_line.startswith("Tor version ") and last_line.endswith("."): + if last_line.startswith('Tor version ') and last_line.endswith('.'): try: version_str = last_line[12:-1] VERSION_CACHE[tor_cmd] = Version(version_str) @@ -180,7 +180,7 @@ class Version(object): self.status = status self.extra = extra - if extra and re.match("^git-[0-9a-f]{16}$", extra): + if extra and re.match('^git-[0-9a-f]{16}$', extra): self.git_commit = extra[4:] else: self.git_commit = None @@ -202,7 +202,7 @@ class Version(object): if not isinstance(other, Version): return False - for attr in ("major", "minor", "micro", "patch"): + for attr in ('major', 'minor', 'micro', 'patch'): my_version = getattr(self, attr) other_version = getattr(other, attr) @@ -220,8 +220,8 @@ class Version(object): # If we *do* encounter two versions that differ only by status tag, we # compare them lexically as ASCII byte strings. - my_status = self.status if self.status else "" - other_status = other.status if other.status else "" + my_status = self.status if self.status else '' + other_status = other.status if other.status else '' return method(my_status, other_status) @@ -258,7 +258,7 @@ class Version(object): if self._hash is None: my_hash = 0 - for attr in ("major", "minor", "micro", "patch", "status"): + for attr in ('major', 'minor', 'micro', 'patch', 'status'): my_hash *= 1024 attr_value = getattr(self, attr) @@ -329,38 +329,38 @@ class _VersionRequirements(object): self.rules.append(new_rule) safecookie_req = _VersionRequirements() -safecookie_req.in_range(Version("0.2.2.36"), Version("0.2.3.0")) -safecookie_req.greater_than(Version("0.2.3.13")) +safecookie_req.in_range(Version('0.2.2.36'), Version('0.2.3.0')) +safecookie_req.greater_than(Version('0.2.3.13')) Requirement = stem.util.enum.Enum( - ("AUTH_SAFECOOKIE", safecookie_req), - ("DROPGUARDS", Version('0.2.5.1-alpha')), - ("EVENT_AUTHDIR_NEWDESCS", Version('0.1.1.10-alpha')), - ("EVENT_BUILDTIMEOUT_SET", Version('0.2.2.7-alpha')), - ("EVENT_CIRC_MINOR", Version('0.2.3.11-alpha')), - ("EVENT_CLIENTS_SEEN", Version('0.2.1.10-alpha')), - ("EVENT_CONF_CHANGED", Version('0.2.3.3-alpha')), - ("EVENT_DESCCHANGED", Version('0.1.2.2-alpha')), - ("EVENT_GUARD", Version('0.1.2.5-alpha')), - ("EVENT_NS", Version('0.1.2.3-alpha')), - ("EVENT_NEWCONSENSUS", Version('0.2.1.13-alpha')), - ("EVENT_SIGNAL", Version('0.2.3.1-alpha')), - ("EVENT_STATUS", Version('0.1.2.3-alpha')), - ("EVENT_STREAM_BW", Version('0.1.2.8-beta')), - ("EVENT_TRANSPORT_LAUNCHED", Version('0.2.5.0-alpha')), - ("EVENT_CONN_BW", Version('0.2.5.2-alpha')), - ("EVENT_CIRC_BW", Version('0.2.5.2-alpha')), - ("EVENT_CELL_STATS", Version('0.2.5.2-alpha')), - ("EVENT_TB_EMPTY", Version('0.2.5.2-alpha')), - ("EVENT_HS_DESC", Version('0.2.5.2-alpha')), - ("EXTENDCIRCUIT_PATH_OPTIONAL", Version("0.2.2.9")), - ("FEATURE_EXTENDED_EVENTS", Version("0.2.2.1-alpha")), - ("FEATURE_VERBOSE_NAMES", Version("0.2.2.1-alpha")), - ("GETINFO_CONFIG_TEXT", Version("0.2.2.7-alpha")), - ("LOADCONF", Version("0.2.1.1")), - ("MICRODESCRIPTOR_IS_DEFAULT", Version("0.2.3.3")), - ("TAKEOWNERSHIP", Version("0.2.2.28-beta")), - ("TORRC_CONTROL_SOCKET", Version("0.2.0.30")), - ("TORRC_PORT_FORWARDING", Version("0.2.3.1-alpha")), - ("TORRC_DISABLE_DEBUGGER_ATTACHMENT", Version("0.2.3.9")), + ('AUTH_SAFECOOKIE', safecookie_req), + ('DROPGUARDS', Version('0.2.5.1-alpha')), + ('EVENT_AUTHDIR_NEWDESCS', Version('0.1.1.10-alpha')), + ('EVENT_BUILDTIMEOUT_SET', Version('0.2.2.7-alpha')), + ('EVENT_CIRC_MINOR', Version('0.2.3.11-alpha')), + ('EVENT_CLIENTS_SEEN', Version('0.2.1.10-alpha')), + ('EVENT_CONF_CHANGED', Version('0.2.3.3-alpha')), + ('EVENT_DESCCHANGED', Version('0.1.2.2-alpha')), + ('EVENT_GUARD', Version('0.1.2.5-alpha')), + ('EVENT_NS', Version('0.1.2.3-alpha')), + ('EVENT_NEWCONSENSUS', Version('0.2.1.13-alpha')), + ('EVENT_SIGNAL', Version('0.2.3.1-alpha')), + ('EVENT_STATUS', Version('0.1.2.3-alpha')), + ('EVENT_STREAM_BW', Version('0.1.2.8-beta')), + ('EVENT_TRANSPORT_LAUNCHED', Version('0.2.5.0-alpha')), + ('EVENT_CONN_BW', Version('0.2.5.2-alpha')), + ('EVENT_CIRC_BW', Version('0.2.5.2-alpha')), + ('EVENT_CELL_STATS', Version('0.2.5.2-alpha')), + ('EVENT_TB_EMPTY', Version('0.2.5.2-alpha')), + ('EVENT_HS_DESC', Version('0.2.5.2-alpha')), + ('EXTENDCIRCUIT_PATH_OPTIONAL', Version('0.2.2.9')), + ('FEATURE_EXTENDED_EVENTS', Version('0.2.2.1-alpha')), + ('FEATURE_VERBOSE_NAMES', Version('0.2.2.1-alpha')), + ('GETINFO_CONFIG_TEXT', Version('0.2.2.7-alpha')), + ('LOADCONF', Version('0.2.1.1')), + ('MICRODESCRIPTOR_IS_DEFAULT', Version('0.2.3.3')), + ('TAKEOWNERSHIP', Version('0.2.2.28-beta')), + ('TORRC_CONTROL_SOCKET', Version('0.2.0.30')), + ('TORRC_PORT_FORWARDING', Version('0.2.3.1-alpha')), + ('TORRC_DISABLE_DEBUGGER_ATTACHMENT', Version('0.2.3.9')), )

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 23 Jun '14

23 Jun '14

commit d8137c82d430ee0ccc82062007bb6b05f10d2336 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 23 14:15:18 2014 +0000 Update translations for https_everywhere_completed --- ms_MY/https-everywhere.dtd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ms_MY/https-everywhere.dtd b/ms_MY/https-everywhere.dtd index 27df9b5..5b8baa1 100644 --- a/ms_MY/https-everywhere.dtd +++ b/ms_MY/https-everywhere.dtd @@ -14,6 +14,7 @@ <!ENTITY https-everywhere.menu.observatory "Tetapan Pemantau SSL"> <!ENTITY https-everywhere.menu.globalEnable "Pengaktifan HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "Nyah-aktifkan HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.showCounter "Tunjukkan Kaunter"> <!ENTITY https-everywhere.prefs.title "Tetapan HTTPS Everywhere"> <!ENTITY https-everywhere.prefs.enable_all "Pengaktifan semua"> @@ -40,3 +41,7 @@ <!ENTITY https-everywhere.popup.paragraph3 "Kami akan sentiasa senang jika anda terus menggunakan versi pembangunan kami dan membantu kami membuatkan HTTPS Everywhere menjadi lebih baik! Anda mungkin mendapati terdapat beberapa lagi kelemahan yang terdapat pada versi ini, dan anda boleh melaporkan kelemahan yang anda dapati di https-everywhere(a)eff.org. Minta maaf atas kesulitan yang anda alami, dan terima kasih kerana menggunakan HTTPS Everywhere."> <!ENTITY https-everywhere.popup.keep "Biarkan saya dalam versi pembangunan"> <!ENTITY https-everywhere.popup.revert "Muat turun versi stabil terbaru"> + +<!ENTITY https-everywhere.ruleset-tests.status_title "Jalankan ujian Set Peraturan HTTPS Dimana Sahaja"> +<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Batal"> +<!ENTITY https-everywhere.ruleset-tests.status_start_button "Mula">

1 0