tor-commits May 2013

tor-commits@lists.torproject.org

20 participants
1497 discussions

[stem/master] Supporting get_pid() remotely via GETINFO
by atagar＠torproject.org 29 May '13

29 May '13

commit 341091492edf7c060609b73b8619b18eda322ebd Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 29 08:44:44 2013 -0700 Supporting get_pid() remotely via GETINFO One of get_pid()'s resolution methods (GETINFO process/pid) works remotely, so attempting it before checking that tor is running locally. --- docs/change_log.rst | 2 +- stem/control.py | 37 +++++++++++++++++++++---------------- stem/util/system.py | 1 + 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 9d49537..6e969fa 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -40,11 +40,11 @@ The following are only available within stem's `git repository * **Controller** - * Added a :class:`~stem.control.Controller` method for querying tor's pid (:func:`~stem.control.Controller.get_pid`) * :class:`~stem.response.events.AddrMapEvent` support for the new CACHED argument (:trac:`8596`, :spec:`25b0d43`) * :func:`~stem.control.Controller.attach_stream` could encounter an undocumented 555 response (:trac:`8701`, :spec:`7286576`) * :class:`~stem.descriptor.server_descriptor.RelayDescriptor` digest validation was broken when dealing with non-unicode content with python 3 (:trac:`8755`) * The :class:`~stem.control.Controller` use of cached content wasn't thread safe (:trac:`8607`) + * Added :func:`~stem.control.Controller.get_pid` method to the:class:`~stem.control.Controller` * **Descriptors** diff --git a/stem/control.py b/stem/control.py index 4d416e8..0062007 100644 --- a/stem/control.py +++ b/stem/control.py @@ -996,9 +996,9 @@ class Controller(BaseController): def get_pid(self, default = UNDEFINED): """ - Provides the process id of tor. This only works if tor is running locally. - Also, most of its checks are platform dependent, and hence are not entirely - reliable. + Provides the process id of tor. This often only works if tor is running + locally. Also, most of its checks are platform dependent, and hence are not + entirely reliable. :param object default: response if the query fails @@ -1008,29 +1008,34 @@ class Controller(BaseController): provided """ - if not self.get_socket().is_localhost(): - if default == UNDEFINED: - raise ValueError("Tor isn't running locally") - else: - return default - pid = self._get_cache("pid") if not pid: + # this is the only pid resolution method that works remotely + getinfo_pid = self.get_info("process/pid", None) if getinfo_pid and getinfo_pid.isdigit(): pid = int(getinfo_pid) - if not pid: - pid_file_path = self.get_conf("PidFile", None) + if self.is_caching_enabled(): + self._set_cache({"pid": pid}) + + if not pid: + if not self.get_socket().is_localhost(): + if default == UNDEFINED: + raise ValueError("Tor isn't running locally") + else: + return default + + pid_file_path = self.get_conf("PidFile", None) - if pid_file_path is not None: - with open(pid_file_path) as pid_file: - pid_file_contents = pid_file.read().strip() + if pid_file_path is not None: + with open(pid_file_path) as pid_file: + pid_file_contents = pid_file.read().strip() - if pid_file_contents.isdigit(): - pid = int(pid_file_contents) + if pid_file_contents.isdigit(): + pid = int(pid_file_contents) if not pid: pid = stem.util.system.get_pid_by_name('tor') diff --git a/stem/util/system.py b/stem/util/system.py index ea8513f..3e72d83 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -22,6 +22,7 @@ best-effort, providing **None** if the lookup fails. get_cwd - provides the current working directory for a given process get_start_time - provides the unix timestamp when the process started get_bsd_jail_id - provides the BSD jail id a given process is running within + get_bsd_jail_path - provides the path of the given BSD jail expand_path - expands relative paths and ~ entries call - runs the given system command and provides back the results

1 0

[arm/master] Dropping getHeartbeat()
by atagar＠torproject.org 29 May '13

29 May '13

commit bb2d38f696c83b185d5938d0ce32a7babcf3853b Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 27 22:19:54 2013 -0700 Dropping getHeartbeat() Removing our getHeartbeat() method in favor of our controllers. --- src/cli/controller.py | 2 +- src/cli/headerPanel.py | 4 ++-- src/util/torTools.py | 10 ---------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 0e45ca9..54ea613 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -469,7 +469,7 @@ def heartbeatCheck(isUnresponsive): """ conn = torTools.getConn() - lastHeartbeat = conn.getHeartbeat() + lastHeartbeat = conn.controller.get_latest_heartbeat() if conn.isAlive() and "BW" in conn.getControllerEvents(): if not isUnresponsive and (time.time() - lastHeartbeat) >= 10: isUnresponsive = True diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index 895db01..f1704dc 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -232,7 +232,7 @@ class HeaderPanel(panel.Panel, threading.Thread): self.addstr(1, x, "Relaying Disabled", uiTools.getColor("cyan")) x += 17 else: - statusTime = torTools.getConn().getHeartbeat() + statusTime = torTools.getConn().controller.get_latest_heartbeat() if statusTime: statusTimeLabel = time.strftime("%H:%M %m/%d/%Y, ", time.localtime(statusTime)) @@ -334,7 +334,7 @@ class HeaderPanel(panel.Panel, threading.Thread): self.addstr(y, x, "none", curses.A_BOLD | uiTools.getColor("cyan")) else: y = 2 if isWide else 4 - statusTime = torTools.getConn().getHeartbeat() + statusTime = torTools.getConn().controller.get_latest_heartbeat() statusTimeLabel = time.strftime("%H:%M %m/%d/%Y", time.localtime(statusTime)) self.addstr(y, 0, "Tor Disconnected", curses.A_BOLD | uiTools.getColor("red")) self.addstr(y, 16, " (%s) - press r to reconnect" % statusTimeLabel) diff --git a/src/util/torTools.py b/src/util/torTools.py index 9fc396b..1576ede 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -161,16 +161,6 @@ class Controller: self.connLock.release() return result - def getHeartbeat(self): - """ - Provides the time of the last registered tor message. - """ - - if self.isAlive(): - return self.controller.get_latest_heartbeat() - else: - return 0 - def getInfo(self, param, default = UNDEFINED): """ Queries the control port for the given GETINFO option, providing the

1 0

[arm/master] Using stem to get tor's start time
by atagar＠torproject.org 29 May '13

29 May '13

commit fdee5d0006f89d8dbde47b529f1f2bbda5bfcdf3 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 28 09:35:11 2013 -0700 Using stem to get tor's start time Replacing our custom implementation for getting tor's start time with stem's new system.get_start_time() function. --- src/util/torTools.py | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 1576ede..bb5e6a5 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1317,23 +1317,10 @@ class Controller: self._pathPrefixLogging = False # prevents logging if fetched again result = prefixPath elif key == "startTime": - myPid = self.controller.get_pid(None) - - if myPid: - if proc.is_available(): - try: - result = float(proc.get_stats(myPid, proc.Stat.START_TIME)[0]) - except: pass - - if not result: - # if we're either not using proc or it fails then try using ps - try: - psCall = system.call("ps -p %s -o etime" % myPid) - - if psCall and len(psCall) >= 2: - etimeEntry = psCall[1].strip() - result = time.time() - str_tools.parse_short_time_label(etimeEntry) - except: pass + try: + result = system.get_start_time(self.controller.get_pid()) + except: + pass elif key == "authorities": # There's two configuration options that can overwrite the default # authorities: DirServer and AlternateDirAuthority.

1 0

[arm/master] Using stem util for getting jail paths
by atagar＠torproject.org 29 May '13

29 May '13

commit adbfee3294c6e4e560c40677aef97ec2624a008c Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 29 08:28:57 2013 -0700 Using stem util for getting jail paths Dropping our jls call in favor of stem's function for this. --- src/util/torTools.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index bb5e6a5..410afd3 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1288,22 +1288,11 @@ class Controller: # make sure the path prefix is valid and exists (providing a notice if not) prefixPath = CONFIG["features.pathPrefix"].strip() - # adjusts the prefix path to account for jails under FreeBSD (many - # thanks to Fabian Keil!) if not prefixPath and os.uname()[0] == "FreeBSD": - torPid = getConn().controller.get_pid(None) - jid = system.get_bsd_jail_id(torPid) - if jid != 0: - # Output should be something like: - # JID IP Address Hostname Path - # 1 10.0.0.2 tor-jail /usr/jails/tor-jail - jlsOutput = system.call("jls -j %s" % jid) - - if len(jlsOutput) == 2 and len(jlsOutput[1].split()) == 4: - prefixPath = jlsOutput[1].split()[3] - - if self._pathPrefixLogging: - log.info("Adjusting paths to account for Tor running in a jail at: %s" % prefixPath) + prefixPath = system.get_bsd_jail_path(getConn().controller.get_pid(0)) + + if prefixPath and self._pathPrefixLogging: + log.info("Adjusting paths to account for Tor running in a jail at: %s" % prefixPath) if prefixPath: # strips off ending slash from the path

1 0

[tor/master] Fix windows compilation warning in test_config.c
by nickm＠torproject.org 29 May '13

29 May '13

commit 4d7ac69f05ea80e0a79efe2af64dfe66d788e8df Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 29 12:08:28 2013 -0400 Fix windows compilation warning in test_config.c bugfix on 78cc5833a1da038331186ddf07f4add7f8f1094b; bug not in any released Tor. Spotted by weasel using Jenkins. --- src/test/test_config.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test_config.c b/src/test/test_config.c index 8316d0e..2a23e33 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -196,7 +196,9 @@ test_config_check_or_create_data_subdir(void *arg) const char *subpath = get_datadir_fname(subdir); struct stat st; int r; +#if !defined (_WIN32) || defined (WINCE) unsigned group_permission; +#endif (void)arg; #if defined (_WIN32) && !defined (WINCE)

1 0

[stem/master] System module's call() function ignored exit statuses
by atagar＠torproject.org 29 May '13

29 May '13

commit 31456707624847f8b0404b2e84ebcc2dc7fe22fd Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 29 08:19:54 2013 -0700 System module's call() function ignored exit statuses Well... oops. Our call() method was documented as raising an OSError (or returning the default value) when the call fails but it completely ignored the exit status. In practice the function only behaved as documented when Popen failed - otherwise it returned an empty list. Fixing this behavior and updating most of our callers since they expected call() to not raise any exceptions. --- docs/change_log.rst | 3 ++ run_tests.py | 2 +- stem/descriptor/__init__.py | 1 + stem/util/system.py | 55 +++++++++++++++++++++--------------- test/integ/util/system.py | 2 +- test/settings.cfg | 2 +- test/unit/response/protocolinfo.py | 2 +- test/unit/util/system.py | 10 +++++-- test/util.py | 10 +++++-- 9 files changed, 56 insertions(+), 31 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index cb0134e..9d49537 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -54,6 +54,9 @@ The following are only available within stem's `git repository * :func:`~stem.util.system.set_process_name` inserted spaces between characters (:trac:`8631`) * :func:`~stem.util.system.get_pid_by_name` can now pull for all processes with a given name + * :func:`~stem.util.system.call` ignored the subprocess' exit status + * Added :func:`stem.util.system.get_start_time` + * Added :func:`stem.util.system.get_bsd_jail_path` * **Website** diff --git a/run_tests.py b/run_tests.py index 67c9a1d..6f77b0f 100755 --- a/run_tests.py +++ b/run_tests.py @@ -37,7 +37,7 @@ from test.util import STEM_BASE, Target, Task # We do an integration test run for each run target we get. # # * Attribute Target (like CHROOT and ONLINE) which indicates -# non-configuration changes to ur test runs. These are applied to all +# non-configuration changes to your test runs. These are applied to all # integration runs that we perform. ARGS = { diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 2567a4b..7252e6a 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -14,6 +14,7 @@ Package for parsing and processing descriptor data. Descriptor - Common parent for all descriptor file types. |- get_path - location of the descriptor on disk if it came from a file |- get_archive_path - location of the descriptor within the archive it came from + |- get_bytes - similar to str(), but provides our original bytes content |- get_unrecognized_lines - unparsed descriptor content +- __str__ - string that the descriptor was made from diff --git a/stem/util/system.py b/stem/util/system.py index 2f3cbd2..ea8513f 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -210,9 +210,10 @@ def is_running(command): primary_resolver = IS_RUNNING_PS_LINUX secondary_resolver = IS_RUNNING_PS_BSD - command_listing = call(primary_resolver) + command_listing = call(primary_resolver, None) + if not command_listing: - command_listing = call(secondary_resolver) + command_listing = call(secondary_resolver, None) if command_listing: command_listing = map(unicode.strip, command_listing) @@ -253,7 +254,7 @@ def get_pid_by_name(process_name, multiple = False): # 3392 if is_available("pgrep"): - results = call(GET_PID_BY_NAME_PGREP % process_name) + results = call(GET_PID_BY_NAME_PGREP % process_name, None) if results: try: @@ -274,7 +275,7 @@ def get_pid_by_name(process_name, multiple = False): # 3392 3283 if is_available("pidof"): - results = call(GET_PID_BY_NAME_PIDOF % process_name) + results = call(GET_PID_BY_NAME_PIDOF % process_name, None) if results and len(results) == 1: try: @@ -306,7 +307,7 @@ def get_pid_by_name(process_name, multiple = False): if is_available("ps"): if not is_bsd(): # linux variant of ps - results = call(GET_PID_BY_NAME_PS_LINUX % process_name) + results = call(GET_PID_BY_NAME_PS_LINUX % process_name, None) if results: try: @@ -321,7 +322,7 @@ def get_pid_by_name(process_name, multiple = False): if is_bsd(): # bsd variant of ps - results = call(GET_PID_BY_NAME_PS_BSD) + results = call(GET_PID_BY_NAME_PS_BSD, None) if results: # filters results to those with our process name @@ -352,7 +353,7 @@ def get_pid_by_name(process_name, multiple = False): # 2561 if is_available("lsof"): - results = call(GET_PID_BY_NAME_LSOF % process_name) + results = call(GET_PID_BY_NAME_LSOF % process_name, None) if results: try: @@ -409,7 +410,7 @@ def get_pid_by_port(port): # udp6 0 0 fe80::7ae4:ff:fe2f::123 :::* - if is_available("netstat"): - results = call(GET_PID_BY_PORT_NETSTAT) + results = call(GET_PID_BY_PORT_NETSTAT, None) if results: # filters to results with our port @@ -442,7 +443,7 @@ def get_pid_by_port(port): # _tor tor 4397 20 tcp4 51.64.7.84:51946 32.83.7.104:443 if is_available("sockstat"): - results = call(GET_PID_BY_PORT_SOCKSTAT % port) + results = call(GET_PID_BY_PORT_SOCKSTAT % port, None) if results: # filters to results where this is the local port @@ -474,7 +475,7 @@ def get_pid_by_port(port): # tor 1745 atagar 6u IPv4 14229 0t0 TCP 127.0.0.1:9051 (LISTEN) if is_available("lsof"): - results = call(GET_PID_BY_PORT_LSOF) + results = call(GET_PID_BY_PORT_LSOF, None) if results: # filters to results with our port @@ -516,9 +517,9 @@ def get_pid_by_open_file(path): # 4762 if is_available("lsof"): - results = call(GET_PID_BY_FILE_LSOF % path) + results = call(GET_PID_BY_FILE_LSOF % path, []) - if results and len(results) == 1: + if len(results) == 1: pid = results[0].strip() if pid.isdigit(): @@ -552,7 +553,7 @@ def get_cwd(pid): # 3799: /home/atagar # 5839: No such process - results = call(GET_CWD_PWDX % pid) + results = call(GET_CWD_PWDX % pid, None) if not results: log.debug("%s pwdx didn't return any results" % logging_prefix) @@ -579,9 +580,9 @@ def get_cwd(pid): # n/Users/atagar/tor/src/or if is_available("lsof"): - results = call(GET_CWD_LSOF % pid) + results = call(GET_CWD_LSOF % pid, []) - if results and len(results) == 2 and results[1].startswith("n/"): + if len(results) == 2 and results[1].startswith("n/"): lsof_result = results[1][1:].strip() # If we lack read permissions for the cwd then it returns... @@ -613,9 +614,9 @@ def get_start_time(pid): pass try: - ps_results = stem.util.system.call("ps -p %s -o etime" % pid) + ps_results = call("ps -p %s -o etime" % pid, []) - if ps_results and len(ps_results) >= 2: + if len(ps_results) >= 2: etime = ps_results[1].strip() return time.time() - stem.util.str_tools.parse_short_time_label(etime) except: @@ -623,6 +624,7 @@ def get_start_time(pid): return None + def get_bsd_jail_id(pid): """ Gets the jail id for a process. These seem to only exist for FreeBSD (this @@ -641,9 +643,9 @@ def get_bsd_jail_id(pid): # JID # 1 - ps_output = call(GET_BSD_JAIL_ID_PS % pid) + ps_output = call(GET_BSD_JAIL_ID_PS % pid, []) - if ps_output and len(ps_output) == 2 and len(ps_output[1].split()) == 1: + if len(ps_output) == 2 and len(ps_output[1].split()) == 1: jid = ps_output[1].strip() if jid.isdigit(): @@ -671,7 +673,7 @@ def get_bsd_jail_path(jid): # Output should be something like: # JID IP Address Hostname Path # 1 10.0.0.2 tor-jail /usr/jails/tor-jail - + jls_output = call(GET_BSD_JAIL_PATH % jid, []) if len(jls_output) == 2 and len(jls_output[1].split()) == 4: @@ -725,7 +727,7 @@ def expand_path(path, cwd = None): return relative_path -def call(command, default = UNDEFINED): +def call(command, default = UNDEFINED, ignore_exit_status = False): """ Issues a command in a subprocess, blocking until completion and returning the results. This is not actually ran in a shell so pipes and other shell syntax @@ -733,6 +735,8 @@ def call(command, default = UNDEFINED): :param str command: command to be issued :param object default: response if the query fails + :param bool ignore_exit_status: reports failure if our command's exit status + was non-zero :returns: **list** with the lines of output from the command @@ -743,7 +747,9 @@ def call(command, default = UNDEFINED): is_shell_command = command.split(" ")[0] in SHELL_COMMANDS start_time = time.time() - stdout, stderr = subprocess.Popen(command.split(), stdout = subprocess.PIPE, stderr = subprocess.PIPE, shell = is_shell_command).communicate() + process = subprocess.Popen(command.split(), stdout = subprocess.PIPE, stderr = subprocess.PIPE, shell = is_shell_command) + + stdout, stderr = process.communicate() stdout, stderr = stdout.strip(), stderr.strip() runtime = time.time() - start_time @@ -757,6 +763,11 @@ def call(command, default = UNDEFINED): elif stderr: log.trace(trace_prefix + ", stderr:\n%s" % stderr) + exit_code = process.poll() + + if not ignore_exit_status and exit_code != 0: + raise OSError("%s returned exit status %i" % (command, exit_code)) + if stdout: return stdout.decode("utf-8", "replace").splitlines() else: diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 1392dfd..0bf77ac 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -21,7 +21,7 @@ def filter_system_call(prefixes): function if it matches one of the prefixes, and acts as a no-op otherwise. """ - def _filter_system_call(command): + def _filter_system_call(command, default): for prefix in prefixes: if command.startswith(prefix): real_call_function = mocking.get_real_function(stem.util.system.call) diff --git a/test/settings.cfg b/test/settings.cfg index bd3e3cd..db318e4 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -132,7 +132,7 @@ pep8.ignore E127 pyflakes.ignore stem/prereq.py => 'RSA' imported but unused pyflakes.ignore stem/prereq.py => 'asn1' imported but unused pyflakes.ignore stem/prereq.py => 'long_to_bytes' imported but unused -pyflakes.ignore stem/descriptor/__init__.py => redefinition of unused 'OrderedDict' from line 60 +pyflakes.ignore stem/descriptor/__init__.py => redefinition of unused 'OrderedDict' from line 61 pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_bytes_impl' from line 51 pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_unicode_impl' from line 57 pyflakes.ignore test/mocking.py => undefined name 'builtins' diff --git a/test/unit/response/protocolinfo.py b/test/unit/response/protocolinfo.py index 86309e7..e8bc884 100644 --- a/test/unit/response/protocolinfo.py +++ b/test/unit/response/protocolinfo.py @@ -156,7 +156,7 @@ class TestProtocolInfoResponse(unittest.TestCase): # - resolving the pid of the "tor" process # - using that to get tor's cwd - def call_mocking(command): + def call_mocking(command, default): if command == stem.util.system.GET_PID_BY_NAME_PGREP % "tor": return ["10"] elif command == stem.util.system.GET_CWD_PWDX % 10: diff --git a/test/unit/util/system.py b/test/unit/util/system.py index c59d2ee..a7b3d9b 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -97,12 +97,14 @@ def mock_call(base_cmd, responses): if base_cmd == command: return responses else: - return None + return default else: for cmd_completion in responses: if command == base_cmd % cmd_completion: return responses[cmd_completion] + return default + return functools.partial(_mock_call, base_cmd, responses) @@ -258,6 +260,8 @@ class TestSystem(unittest.TestCase): lsof_query = system.GET_PID_BY_FILE_LSOF % "/tmp/foo" mocking.mock(system.call, mock_call(lsof_query, ["4762"])) self.assertEquals(4762, system.get_pid_by_open_file("/tmp/foo")) + + mocking.mock(system.call, mocking.return_value([])) self.assertEquals(None, system.get_pid_by_open_file("/tmp/somewhere_else")) def test_get_cwd_pwdx(self): @@ -286,7 +290,7 @@ class TestSystem(unittest.TestCase): responses = { "75717": ["p75717", "n/Users/atagar/tor/src/or"], "1234": ["malformed output"], - "7878": None, + "7878": [], } mocking.mock(system.call, mock_call(system.GET_CWD_LSOF, responses)) @@ -306,7 +310,7 @@ class TestSystem(unittest.TestCase): "3333": ["JID", "bad data"], "4444": ["bad data"], "5555": [], - "6666": None + "6666": [] } mocking.mock(system.call, mock_call(system.GET_BSD_JAIL_ID_PS, responses)) diff --git a/test/util.py b/test/util.py index f87ecb3..4cdbdc2 100644 --- a/test/util.py +++ b/test/util.py @@ -243,7 +243,10 @@ def get_stylistic_issues(paths): issues = {} for path in paths: - pep8_output = stem.util.system.call("pep8 --ignore %s %s" % (ignored_issues, path)) + pep8_output = stem.util.system.call( + "pep8 --ignore %s %s" % (ignored_issues, path), + ignore_exit_status = True, + ) for line in pep8_output: line_match = re.match("^(.*):(\d+):(\d+): (.*)$", line) @@ -329,7 +332,10 @@ def get_pyflakes_issues(paths): issues = {} for path in paths: - pyflakes_output = stem.util.system.call("pyflakes %s" % path) + pyflakes_output = stem.util.system.call( + "pyflakes %s" % path, + ignore_exit_status = True, + ) for line in pyflakes_output: line_match = re.match("^(.*):(\d+): (.*)$", line)

1 0

[stem/master] System utility for getting process start times
by atagar＠torproject.org 29 May '13

29 May '13

commit 24d9377cdc2d1ee3531238b825621934053bae9f Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 28 09:32:13 2013 -0700 System utility for getting process start times Adding a get_start_time() to the system utils to provide the unix timestamp for when a given pid started. --- stem/util/system.py | 29 +++++++++++++++++++++++++++++ test/integ/util/system.py | 29 +++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/stem/util/system.py b/stem/util/system.py index 6b767c7..e760ae5 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -20,6 +20,7 @@ best-effort, providing **None** if the lookup fails. get_pid_by_port - gets the pid for a process listening to a given port get_pid_by_open_file - gets the pid for the process with an open file get_cwd - provides the current working directory for a given process + get_start_time - provides the unix timestamp when the process started get_bsd_jail_id - provides the BSD jail id a given process is running within expand_path - expands relative paths and ~ entries call - runs the given system command and provides back the results @@ -530,6 +531,7 @@ def get_cwd(pid): Provides the working directory of the given process. :param int pid: process id of the process to be queried + :returns: **str** with the absolute path for the process' present working directory, **None** if it can't be determined """ @@ -593,6 +595,33 @@ def get_cwd(pid): return None # all queries failed +def get_start_time(pid): + """ + Provides the unix timestamp when the given process started. + + :param int pid: process id of the process to be queried + + :returns: **float** for the unix timestamp when the process began, **None** + if it can't be determined + """ + + if stem.util.proc.is_available(): + try: + return float(stem.util.proc.get_stats(pid, stem.util.proc.Stat.START_TIME)[0]) + except IOError: + pass + + try: + ps_results = stem.util.system.call("ps -p %s -o etime" % pid) + + if ps_results and len(ps_results) >= 2: + etime = ps_results[1].strip() + return time.time() - stem.util.str_tools.parse_short_time_label(etime) + except: + pass + + return None + def get_bsd_jail_id(pid): """ Gets the jail id for a process. These seem to only exist for FreeBSD (this diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 63486a4..1392dfd 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -8,6 +8,7 @@ import os import tempfile import unittest +import stem.util.proc import stem.util.system import test.runner @@ -382,6 +383,34 @@ class TestSystem(unittest.TestCase): runner_pid, tor_cwd = runner.get_pid(), runner.get_tor_cwd() self.assertEquals(tor_cwd, stem.util.system.get_cwd(runner_pid)) + def test_get_start_time_proc(self): + """ + Tests the get_start_time function with a proc response. + """ + + if not stem.util.proc.is_available(): + test.runner.skip(self, "(proc unavailable)") + return + + mocking.mock(stem.util.system.call, filter_system_call(['ps '])) + + pid = test.runner.get_runner().get_pid() + self.assertTrue(stem.util.system.get_start_time(pid) >= 0) + + def test_get_start_time_ps(self): + """ + Tests the get_start_time function with a ps response. + """ + + if not stem.util.system.is_available("ps"): + test.runner.skip(self, "(ps unavailable)") + return + + mocking.mock(stem.util.proc.is_available, mocking.return_false()) + + pid = test.runner.get_runner().get_pid() + self.assertTrue(stem.util.system.get_start_time(pid) >= 0) + def test_get_bsd_jail_id(self): """ Exercises the stem.util.system.get_bsd_jail_id function, running through

1 0

[stem/master] System utility for getting FreeBSD jail paths
by atagar＠torproject.org 29 May '13

29 May '13

commit 18aa77f4d6074e54db84f93e630aaacd5e3fbcb3 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 28 17:32:11 2013 -0700 System utility for getting FreeBSD jail paths Adding a util to better support FreeBSD jails (a rather common way to run tor on that platform). --- stem/util/system.py | 23 +++++++++++++++++++++++ test/unit/util/system.py | 20 +++++++++++++++++++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/stem/util/system.py b/stem/util/system.py index e760ae5..2f3cbd2 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -69,6 +69,7 @@ GET_PID_BY_FILE_LSOF = "lsof -tw %s" GET_CWD_PWDX = "pwdx %s" GET_CWD_LSOF = "lsof -a -p %s -d cwd -Fn" GET_BSD_JAIL_ID_PS = "ps -p %s -o jid" +GET_BSD_JAIL_PATH = "jls -j %s" # flag for setting the process name, found in '/usr/include/linux/prctl.h' @@ -657,6 +658,28 @@ def get_bsd_jail_id(pid): return 0 +def get_bsd_jail_path(jid): + """ + Provides the path of the given FreeBSD jail. + + :param int jid: jail id to be queried + + :returns: **str** of the path prefix, **None** if this can't be determined + """ + + if jid != 0: + # Output should be something like: + # JID IP Address Hostname Path + # 1 10.0.0.2 tor-jail /usr/jails/tor-jail + + jls_output = call(GET_BSD_JAIL_PATH % jid, []) + + if len(jls_output) == 2 and len(jls_output[1].split()) == 4: + return jls_output[1].split()[3] + + return None + + def expand_path(path, cwd = None): """ Provides an absolute path, expanding tildes with the user's home and diff --git a/test/unit/util/system.py b/test/unit/util/system.py index fc961cd..c59d2ee 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -62,6 +62,11 @@ GET_PID_BY_PORT_LSOF_RESULTS = [ "tor 1745 atagar 6u IPv4 14229 0t0 TCP 127.0.0.1:9051 (LISTEN)", "apache 329 atagar 6u IPv4 14229 0t0 TCP 127.0.0.1:80 (LISTEN)"] +GET_BSD_JAIL_PATH_RESULTS = [ + " JID IP Address Hostname Path", + " 1 10.0.0.2 tor-jail /usr/jails/tor-jail", +] + def mock_call(base_cmd, responses): """ @@ -87,7 +92,7 @@ def mock_call(base_cmd, responses): functor to override stem.util.system.call with """ - def _mock_call(base_cmd, responses, command): + def _mock_call(base_cmd, responses, command, default = None): if isinstance(responses, list): if base_cmd == command: return responses @@ -310,6 +315,19 @@ class TestSystem(unittest.TestCase): expected_response = 1 if test_input == "1111" else 0 self.assertEquals(expected_response, system.get_bsd_jail_id(test_input)) + def test_get_bsd_jail_path(self): + """ + Tests the get_bsd_jail_path function. + """ + + # check when we don't have a jail + + mocking.mock(system.call, mocking.return_value([])) + self.assertEquals(None, system.get_bsd_jail_path(1)) + + mocking.mock(system.call, mock_call(system.GET_BSD_JAIL_PATH % '1', GET_BSD_JAIL_PATH_RESULTS)) + self.assertEquals("/usr/jails/tor-jail", system.get_bsd_jail_path(1)) + def test_expand_path_unix(self): """ Tests the expand_path function. This does not exercise home directory

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 29 May '13

29 May '13

commit 5787406305d65bc159d3c46baf374b8469f045c7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 29 11:45:27 2013 +0000 Update translations for vidalia_alpha_completed --- nb/vidalia_nb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nb/vidalia_nb.po b/nb/vidalia_nb.po index e287c17..c11ba1d 100644 --- a/nb/vidalia_nb.po +++ b/nb/vidalia_nb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2013-05-29 11:13+0000\n" +"PO-Revision-Date: 2013-05-29 11:40+0000\n" "Last-Translator: lateralus\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -3466,7 +3466,7 @@ msgid "" "Tor is trying to determine if your relay's directory port is reachable from " "the Tor network by connecting to itself at %1:%2. This test could take " "several minutes." -msgstr "Tor tester om ditt relé's katalog port er tilgjengelig fra Tor-nettverket ved å koble til seg selv via %1:%2. Denne testen kan ta flere minutter." +msgstr "Tor tester om reléets katalogport er tilgjengelig fra Tor-nettverket ved å koble til seg selv via %1:%2. Denne testen kan ta flere minutter." msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Successful!" @@ -3474,7 +3474,7 @@ msgstr "Katalog Port Tilgjengelighetstest vellykket!" msgctxt "StatusEventWidget" msgid "Your relay's directory port is reachable from the Tor network!" -msgstr "Ditt relé's katalog port er tilgjengelig fra Tor-nettverket!" +msgstr "Ditt relés katalogport kan nås fra Tor-nettverket!" msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Failed" @@ -3486,7 +3486,7 @@ msgid "" "happen if you are behind a router or firewall that requires you to set up " "port forwarding. If %1:%2 is not your correct IP address and directory port," " please check your relay's configuration." -msgstr "Ditt relé's katalog port kan ikke nås av andre Tor brukere. Dette kan skje dersom du er bak en ruter eller brannmur som krever at du setter opp port-omkobling. Dersom %1:%2 ikke er riktig IP-adresse og katalog port, vennligst sjekk ditt relé's konfigurasjon." +msgstr "Ditt relés katalogport kan ikke nås av andre Tor-klienter. Dette kan skje dersom du er bak en ruter eller brannmur som krever at du setter opp portordning. Dersom %1:%2 ikke er riktig IP-adresse og katalogport, vennligst sjekk reléets konfigurasjon." msgctxt "StatusEventWidget" msgid "Relay Descriptor Rejected"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 29 May '13

29 May '13

commit a4dfa8c3fd7d9152a9c246e05afc7e55483ce230 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 29 11:45:24 2013 +0000 Update translations for vidalia_alpha --- nb/vidalia_nb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nb/vidalia_nb.po b/nb/vidalia_nb.po index e287c17..c11ba1d 100644 --- a/nb/vidalia_nb.po +++ b/nb/vidalia_nb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2013-05-29 11:13+0000\n" +"PO-Revision-Date: 2013-05-29 11:40+0000\n" "Last-Translator: lateralus\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -3466,7 +3466,7 @@ msgid "" "Tor is trying to determine if your relay's directory port is reachable from " "the Tor network by connecting to itself at %1:%2. This test could take " "several minutes." -msgstr "Tor tester om ditt relé's katalog port er tilgjengelig fra Tor-nettverket ved å koble til seg selv via %1:%2. Denne testen kan ta flere minutter." +msgstr "Tor tester om reléets katalogport er tilgjengelig fra Tor-nettverket ved å koble til seg selv via %1:%2. Denne testen kan ta flere minutter." msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Successful!" @@ -3474,7 +3474,7 @@ msgstr "Katalog Port Tilgjengelighetstest vellykket!" msgctxt "StatusEventWidget" msgid "Your relay's directory port is reachable from the Tor network!" -msgstr "Ditt relé's katalog port er tilgjengelig fra Tor-nettverket!" +msgstr "Ditt relés katalogport kan nås fra Tor-nettverket!" msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Failed" @@ -3486,7 +3486,7 @@ msgid "" "happen if you are behind a router or firewall that requires you to set up " "port forwarding. If %1:%2 is not your correct IP address and directory port," " please check your relay's configuration." -msgstr "Ditt relé's katalog port kan ikke nås av andre Tor brukere. Dette kan skje dersom du er bak en ruter eller brannmur som krever at du setter opp port-omkobling. Dersom %1:%2 ikke er riktig IP-adresse og katalog port, vennligst sjekk ditt relé's konfigurasjon." +msgstr "Ditt relés katalogport kan ikke nås av andre Tor-klienter. Dette kan skje dersom du er bak en ruter eller brannmur som krever at du setter opp portordning. Dersom %1:%2 ikke er riktig IP-adresse og katalogport, vennligst sjekk reléets konfigurasjon." msgctxt "StatusEventWidget" msgid "Relay Descriptor Rejected"

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
150
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2013