May 2013 - tor-commits - lists.torproject.org

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 28 May '13

28 May '13

commit cf1e4f126ac83cd2b6a19ab154c06978595a380a Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 28 11:15:35 2013 +0000 Update translations for vidalia_help --- uk/index.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uk/index.po b/uk/index.po index 6115555..ee8bc5d 100644 --- a/uk/index.po +++ b/uk/index.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:59+0200\n" -"PO-Revision-Date: 2013-05-28 10:40+0000\n" +"PO-Revision-Date: 2013-05-28 10:50+0000\n" "Last-Translator: muhozhrun <sanduliak(a)gmail.com>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n" @@ -45,4 +45,4 @@ msgstr "Кнопка Додому поверне вас на цю дом msgid "" "See the <a href=\"links.html\">Helpful Links</a> topic for some places you " "can visit to find additional help and information about Vidalia and Tor." -msgstr "" +msgstr "У розділі <a href=\"links.html\">Корисні посилання</a> знаходяться деякі місця, відвідавши які, можна знайти додаткову допоміжну інформацію про Vidalia і Tor."

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 28 May '13

28 May '13

commit e078fa3ceb7f0d32d184c72be99ea5ece16097dc Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 28 10:45:34 2013 +0000 Update translations for vidalia_help --- uk/index.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/uk/index.po b/uk/index.po index f2a405e..6115555 100644 --- a/uk/index.po +++ b/uk/index.po @@ -1,13 +1,14 @@ # # Translators: # jonny_nut <jonny_nut(a)hotmail.com>, 2011 +# muhozhrun <sanduliak(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:59+0200\n" -"PO-Revision-Date: 2013-05-22 12:42+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-05-28 10:40+0000\n" +"Last-Translator: muhozhrun <sanduliak(a)gmail.com>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,19 +26,19 @@ msgstr "Довідка Vidalia" msgid "" "Select a help topic from the tree on the left or click on the Search button " "above the list of topics to search through all available help topics." -msgstr "Виберіть розділ довідки з дерева зліва або натисніть на кнопку Пошук вище перелік тем для пошуку через усі доступні теми допомоги." +msgstr "Виберіть розділ допомоги з дерева ліворуч або натисніть кнопку \"Пошук\", яка знаходиться над списком розділів, для пошуку у всіх доступних розділах відразу. \"" #. type: Content of: <html><body> #: en/index.html:25 msgid "" "You can use the Find button on the toolbar above to search within a " "particular help topic." -msgstr "" +msgstr "Ви можете скористатись кнопкою Знайти, що знаходиться вгорі на панелі інструментів, щоб знайти текст у конкретному розділі." #. type: Content of: <html><body> #: en/index.html:30 msgid "The Home button above will bring you back to this home page." -msgstr "" +msgstr "Кнопка Додому поверне вас на цю домашню сторінку." #. type: Content of: <html><body> #: en/index.html:34

1 0

[arm/master] Utilizing stem's pid resolution
by atagar＠torproject.org 28 May '13

28 May '13

commit 9ea729942a7046ea72ccfbddb011c0342eaf3560 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 27 21:40:55 2013 -0700 Utilizing stem's pid resolution Dropping our getPid() helper function in favor of stem's new Controller method for doing this. --- src/cli/controller.py | 10 +++---- src/cli/graphing/bandwidthStats.py | 2 +- src/cli/graphing/resourceStats.py | 2 +- src/cli/headerPanel.py | 3 +- src/util/torConfig.py | 2 +- src/util/torTools.py | 55 ++++-------------------------------- 6 files changed, 15 insertions(+), 59 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 03b05e2..0e45ca9 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -499,10 +499,10 @@ def connResetListener(controller, eventType, _): if getController().getPanel("torrc") == None: torConfig.getTorrc().load(True) - torPid = controller.get_info("process/pid", None) - - if torPid and torPid != resolver.getPid(): - resolver.setPid(torPid) + try: + resolver.setPid(controller.get_pid()) + except ValueError: + pass def startTorMonitor(startTime): """ @@ -515,7 +515,7 @@ def startTorMonitor(startTime): # attempts to fetch the tor pid, warning if unsuccessful (this is needed for # checking its resource usage, among other things) conn = torTools.getConn() - torPid = conn.getMyPid() + torPid = conn.controller.get_pid(None) if not torPid and conn.isAlive(): log.warn("Unable to determine Tor's pid. Some information, like its resource usage will be unavailable.") diff --git a/src/cli/graphing/bandwidthStats.py b/src/cli/graphing/bandwidthStats.py index 698a2b1..935e23d 100644 --- a/src/cli/graphing/bandwidthStats.py +++ b/src/cli/graphing/bandwidthStats.py @@ -125,7 +125,7 @@ class BandwidthStats(graphPanel.GraphStats): # TODO: stem dropped system caching support so we'll need to think of # something else uptime = None - queryPid = conn.getMyPid() + queryPid = conn.controller.get_pid(None) if queryPid: queryParam = ["%cpu", "rss", "%mem", "etime"] queryCmd = "ps -p %s -o %s" % (queryPid, ",".join(queryParam)) diff --git a/src/cli/graphing/resourceStats.py b/src/cli/graphing/resourceStats.py index d9c15b5..c0f18c9 100644 --- a/src/cli/graphing/resourceStats.py +++ b/src/cli/graphing/resourceStats.py @@ -14,7 +14,7 @@ class ResourceStats(graphPanel.GraphStats): def __init__(self): graphPanel.GraphStats.__init__(self) - self.queryPid = torTools.getConn().getMyPid() + self.queryPid = torTools.getConn().controller.get_pid(None) def clone(self, newCopy=None): if not newCopy: newCopy = ResourceStats() diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index b1bd65e..895db01 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -516,8 +516,7 @@ class HeaderPanel(panel.Panel, threading.Thread): self.vals["sys/os"] = unameVals[0] self.vals["sys/version"] = unameVals[2] - pid = conn.getMyPid() - self.vals["tor/pid"] = pid if pid else "" + self.vals["tor/pid"] = conn.controller.get_pid("") startTime = conn.getStartTime() self.vals["tor/startTime"] = startTime if startTime else "" diff --git a/src/util/torConfig.py b/src/util/torConfig.py index 52caae6..5f4e525 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -343,7 +343,7 @@ def getConfigLocation(): conn = torTools.getConn() configLocation = conn.getInfo("config-file", None) - torPid, torPrefix = conn.getMyPid(), conn.getPathPrefix() + torPid, torPrefix = conn.controller.get_pid(None), conn.getPathPrefix() if not configLocation: raise IOError("unable to query the torrc location") try: diff --git a/src/util/torTools.py b/src/util/torTools.py index 397a32a..62898d5 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -51,37 +51,6 @@ REQ_EVENTS = {"NEWDESC": "information related to descriptors will grow stale", "NS": "information related to the consensus will grow stale", "NEWCONSENSUS": "information related to the consensus will grow stale"} -def getPid(controlPort=9051, pidFilePath=None): - """ - Attempts to determine the process id for a running tor process. This uses - the PidFile if it's available, otherwise trying to figure it out from our - process name and control port. - - Arguments: - controlPort - control port of the tor process if multiple exist - pidFilePath - path to the pid file generated by tor - """ - - # attempts to fetch via the PidFile, failing if: - # - the option is unset - # - unable to read the file (such as insufficient permissions) - - if pidFilePath: - try: - pidFile = open(pidFilePath, "r") - pidEntry = pidFile.readline().strip() - pidFile.close() - - if pidEntry.isdigit(): return pidEntry - except: pass - - pid = stem.util.system.get_pid_by_name('tor') - - if pid is None: - pid = stem.util.system.get_pid_by_port(controlPort) - - return pid - def isTorRunning(): """ Simple check for if a tor process is running. If this can't be determined @@ -523,14 +492,6 @@ class Controller: else: return False - def getMyPid(self): - """ - Provides the pid of the attached tor process (None if no controller exists - or this can't be determined). - """ - - return self._getRelayAttr("pid", None) - def getMyUser(self): """ Provides the user this process is running under. If unavailable this @@ -553,7 +514,7 @@ class Controller: result = None if self.isAlive() and proc.is_available(): - myPid = self.getMyPid() + myPid = self.controller.get_pid(None) if myPid: try: result = len(os.listdir("/proc/%s/fd" % myPid)) @@ -996,7 +957,8 @@ class Controller: if self._isReset: break if not self._isReset: - errorLine, torPid = "", self.getMyPid() + errorLine, torPid = "", self.controller.get_pid(None) + if torPid: for line in pkillOutput: if line.startswith("pkill: %s - " % torPid): @@ -1320,11 +1282,6 @@ class Controller: if line.startswith("s "): result = line[2:].split() break - elif key == "pid": - result = self.getInfo("process/pid", None) - - if not result: - result = getPid(int(self.getOption("ControlPort", 9051)), self.getOption("PidFile", None)) elif key == "user": # provides the empty string if the query fails queriedUser = self.getInfo("process/user", None) @@ -1332,7 +1289,7 @@ class Controller: if queriedUser != None and queriedUser != "": result = queriedUser else: - myPid = self.getMyPid() + myPid = self.controller.get_pid(None) if myPid: # if proc contents are available then fetch the pid from there and @@ -1378,7 +1335,7 @@ class Controller: # 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().getMyPid() + torPid = getConn().controller.get_pid(None) jid = system.get_bsd_jail_id(torPid) if jid != 0: # Output should be something like: @@ -1404,7 +1361,7 @@ class Controller: self._pathPrefixLogging = False # prevents logging if fetched again result = prefixPath elif key == "startTime": - myPid = self.getMyPid() + myPid = self.controller.get_pid(None) if myPid: if proc.is_available():

1 0

[arm/master] Using stem's utils for resolving our pid
by atagar＠torproject.org 28 May '13

28 May '13

commit 477959a0d30662d0d6c85000eeaac4cdda6d01ba Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 27 20:22:25 2013 -0700 Using stem's utils for resolving our pid Our getPid() function does a lot of work, almost all of it redundant with its stem.util.system counterparts (which unlike arm, has tests!). --- src/util/torTools.py | 125 ++++---------------------------------------------- 1 file changed, 10 insertions(+), 115 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 31dace4..397a32a 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -14,6 +14,7 @@ import Queue import stem import stem.control import stem.descriptor +import stem.util.system from util import connections @@ -52,20 +53,9 @@ REQ_EVENTS = {"NEWDESC": "information related to descriptors will grow stale", def getPid(controlPort=9051, pidFilePath=None): """ - Attempts to determine the process id for a running tor process, using the - following: - 1. GETCONF PidFile - 2. "pgrep -x tor" - 3. "pidof tor" - 4. "netstat -npl | grep 127.0.0.1:%s" % <tor control port> - 5. "ps -o pid -C tor" - 6. "sockstat -4l -P tcp -p %i | grep tor" % <tor control port> - 7. "ps axc | egrep \" tor$\"" - 8. "lsof -wnPi | egrep \"^tor.*:%i\"" % <tor control port> - - If pidof or ps provide multiple tor instances then their results are - discarded (since only netstat can differentiate using the control port). This - provides None if either no running process exists or it can't be determined. + Attempts to determine the process id for a running tor process. This uses + the PidFile if it's available, otherwise trying to figure it out from our + process name and control port. Arguments: controlPort - control port of the tor process if multiple exist @@ -85,107 +75,12 @@ def getPid(controlPort=9051, pidFilePath=None): if pidEntry.isdigit(): return pidEntry except: pass - # attempts to resolve using pgrep, failing if: - # - tor is running under a different name - # - there are multiple instances of tor - try: - results = system.call("pgrep -x tor") - if len(results) == 1 and len(results[0].split()) == 1: - pid = results[0].strip() - if pid.isdigit(): return pid - except IOError: pass - - # attempts to resolve using pidof, failing if: - # - tor's running under a different name - # - there's multiple instances of tor - try: - results = system.call("pidof tor") - if len(results) == 1 and len(results[0].split()) == 1: - pid = results[0].strip() - if pid.isdigit(): return pid - except IOError: pass - - # attempts to resolve using netstat, failing if: - # - tor's being run as a different user due to permissions - try: - results = system.call("netstat -npl") - results = filter(lambda line: "127.0.0.1:%i" % controlPort in line, results) - - if len(results) == 1: - results = results[0].split()[6] # process field (ex. "7184/tor") - pid = results[:results.find("/")] - if pid.isdigit(): return pid - except IOError: pass - - # attempts to resolve using ps, failing if: - # - tor's running under a different name - # - there's multiple instances of tor - try: - results = system.call("ps -o pid -C tor") - if len(results) == 2: - pid = results[1].strip() - if pid.isdigit(): return pid - except IOError: pass - - # attempts to resolve using sockstat, failing if: - # - sockstat doesn't accept the -4 flag (BSD only) - # - tor is running under a different name - # - there are multiple instances of Tor, using the - # same control port on different addresses. - # - # TODO: the later two issues could be solved by filtering for the control - # port IP address instead of the process name. - try: - results = system.call("sockstat -4l -P tcp -p %i" % controlPort) - results = filter(lambda line: "tor" in line, results) - - if len(results) == 1 and len(results[0].split()) == 7: - pid = results[0].split()[2] - if pid.isdigit(): return pid - except IOError: pass - - # attempts to resolve via a ps command that works on the mac (this and lsof - # are the only resolvers to work on that platform). This fails if: - # - tor's running under a different name - # - there's multiple instances of tor - - try: - results = system.call("ps axc") - results = filter(lambda line: line.endswith(" tor"), results) - - if len(results) == 1 and len(results[0].split()) > 0: - pid = results[0].split()[0] - if pid.isdigit(): return pid - except IOError: pass - - # attempts to resolve via lsof - this should work on linux, mac, and bsd - - # this fails if: - # - tor's running under a different name - # - tor's being run as a different user due to permissions - # - there are multiple instances of Tor, using the - # same control port on different addresses. - - try: - results = system.call("lsof -wnPi") - results = filter(lambda line: line.startswith("tor.*:%i" % controlPort), results) - - # This can result in multiple entries with the same pid (from the query - # itself). Checking all lines to see if they're in agreement about the pid. - - if results: - pid = "" - - for line in results: - lineComp = line.split() - - if len(lineComp) >= 2 and (not pid or lineComp[1] == pid): - pid = lineComp[1] - else: raise IOError - - if pid.isdigit(): return pid - except IOError: pass - - return None + pid = stem.util.system.get_pid_by_name('tor') + + if pid is None: + pid = stem.util.system.get_pid_by_port(controlPort) + + return pid def isTorRunning(): """

1 0

[arm/master] Replacing isTorRunning() with stem util
by atagar＠torproject.org 28 May '13

28 May '13

commit 12ef6f0b5092745fb4fa442207306907204530e7 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 27 21:46:08 2013 -0700 Replacing isTorRunning() with stem util Dropping our isTorRunning() helper function in favour of a stem utility that strives to be quite a bit more through. --- src/starter.py | 2 +- src/util/torTools.py | 34 ---------------------------------- 2 files changed, 1 insertion(+), 35 deletions(-) diff --git a/src/starter.py b/src/starter.py index 303c342..840e914 100644 --- a/src/starter.py +++ b/src/starter.py @@ -357,7 +357,7 @@ if __name__ == '__main__': # - tor is running (otherwise it would be kinda confusing, "tor is running # but why does arm say that it's shut down?") - if util.torTools.isTorRunning(): + if len(stem.util.system.get_pid_by_name('tor', multiple = True)) >= 1: config.set("features.allowDetachedStartup", "false") # syncs config and parameters, saving changed config options and overwriting diff --git a/src/util/torTools.py b/src/util/torTools.py index 62898d5..9fc396b 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -51,40 +51,6 @@ REQ_EVENTS = {"NEWDESC": "information related to descriptors will grow stale", "NS": "information related to the consensus will grow stale", "NEWCONSENSUS": "information related to the consensus will grow stale"} -def isTorRunning(): - """ - Simple check for if a tor process is running. If this can't be determined - then this returns False. - """ - - # Linux and the BSD families have different variants of ps. Guess based on - # os.uname() results which to try first, then fall back to the other. - # - # Linux - # -A - Select all processes. Identical to -e. - # -co command - Shows just the base command. - # - # Mac / BSD - # -a - Display information about other users' processes as well as - # your own. - # -o ucomm= - Shows just the ucomm attribute ("name to be used for - # accounting") - - primaryResolver, secondaryResolver = "ps -A co command", "ps -ao ucomm=" - - if os.uname()[0] in ("Darwin", "FreeBSD", "OpenBSD"): - primaryResolver, secondaryResolver = secondaryResolver, primaryResolver - - commandResults = system.call(primaryResolver) - if not commandResults: - commandResults = system.call(secondaryResolver) - - if commandResults: - for cmd in commandResults: - if cmd.strip() == "tor": return True - - return False - def getConn(): """ Singleton constructor for a Controller. Be aware that this starts as being

1 0

[arm/master] Accounting for stem's discontinued use of meets_requirements()
by atagar＠torproject.org 28 May '13

28 May '13

commit a2595d9720a67cbd12b22bbcd15c3fe3f778f230 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 27 20:11:59 2013 -0700 Accounting for stem's discontinued use of meets_requirements() Stem removed the meets_requirements() method prior to its initial release... Traceback (most recent call last): File "./src/starter.py", line 478, in <module> cli.controller.startTorMonitor(time.time() - initTime) File "/home/atagar/Desktop/arm/src/cli/controller.py", line 564, in startTorMonitor curses.wrapper(drawTorMonitor, startTime) File "/usr/lib/python2.7/curses/wrapper.py", line 43, in wrapper return func(stdscr, *args, **kwds) File "/home/atagar/Desktop/arm/src/cli/controller.py", line 618, in drawTorMonitor control.redraw(False) File "/home/atagar/Desktop/arm/src/cli/controller.py", line 346, in redraw panelImpl.redraw(force) File "/home/atagar/Desktop/arm/src/util/panel.py", line 405, in redraw self.draw(self.maxX, self.maxY) File "/home/atagar/Desktop/arm/src/cli/torrcPanel.py", line 178, in draw corrections = dict((lineNum, (issue, msg)) for lineNum, issue, msg in loadedTorrc.getCorrections()) File "/home/atagar/Desktop/arm/src/util/torConfig.py", line 797, in getCorrections skipValidation |= (torVersion is None or not torVersion.meets_requirements(stem.version.Requirement.GETINFO_CONFIG_TEXT)) AttributeError: 'Version' object has no attribute 'meets_requirements' --- src/util/torConfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/torConfig.py b/src/util/torConfig.py index a26cced..52caae6 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -794,7 +794,7 @@ class Torrc(): else: torVersion = torTools.getConn().getVersion() skipValidation = not CONFIG["features.torrc.validate"] - skipValidation |= (torVersion is None or not torVersion.meets_requirements(stem.version.Requirement.GETINFO_CONFIG_TEXT)) + skipValidation |= (torVersion is None or not torVersion >= stem.version.Requirement.GETINFO_CONFIG_TEXT) if skipValidation: log.info("Skipping torrc validation (requires tor 0.2.2.7-alpha)")

1 0

[stem/master] Performing pid resolion via getinfo when able
by atagar＠torproject.org 28 May '13

28 May '13

commit 292ef5c36e38dd2820ed00e34ab270f2bb28ecb6 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 27 21:28:55 2013 -0700 Performing pid resolion via getinfo when able Oops, forgot that I had added a 'GETINFO process/pid' option to tor for just this case. Using it when it's available. --- stem/control.py | 18 ++++++++++++------ test/unit/control/controller.py | 13 +++++++++++-- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/stem/control.py b/stem/control.py index a1a7ae4..4d416e8 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1017,14 +1017,20 @@ class Controller(BaseController): pid = self._get_cache("pid") if not pid: - pid_file_path = self.get_conf("PidFile", None) + getinfo_pid = self.get_info("process/pid", None) - if pid_file_path is not None: - with open(pid_file_path) as pid_file: - pid_file_contents = pid_file.read().strip() + if getinfo_pid and getinfo_pid.isdigit(): + pid = int(getinfo_pid) - if pid_file_contents.isdigit(): - pid = int(pid_file_contents) + if not pid: + 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_contents.isdigit(): + pid = int(pid_file_contents) if not pid: pid = stem.util.system.get_pid_by_name('tor') diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index ab89ac0..449bc6d 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -258,6 +258,15 @@ class TestControl(unittest.TestCase): self.assertRaises(ValueError, self.controller.get_pid) self.assertEqual(123, self.controller.get_pid(123)) + def test_get_pid_by_getinfo(self): + """ + Exercise the get_pid() resolution via its getinfo option. + """ + + mocking.mock_method(ControlSocket, "is_localhost", mocking.return_true()) + mocking.mock_method(Controller, "get_info", mocking.return_value('321')) + self.assertEqual(321, self.controller.get_pid()) + def test_get_pid_by_pid_file(self): """ Exercise the get_pid() resolution via a PidFile. @@ -272,10 +281,10 @@ class TestControl(unittest.TestCase): try: with open(pid_file_path, 'w') as pid_file: - pid_file.write('321') + pid_file.write('432') mocking.mock_method(Controller, "get_conf", mocking.return_value(pid_file_path)) - self.assertEqual(321, self.controller.get_pid()) + self.assertEqual(432, self.controller.get_pid()) finally: os.remove(pid_file_path)

1 0

[stem/master] Controller method to query tor's pid
by atagar＠torproject.org 28 May '13

28 May '13

commit 0f7d5d118d83db000dd57b646ba91d4152c44e91 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 27 21:20:42 2013 -0700 Controller method to query tor's pid Adding a get_pid() method to the controller to make it simpler to figure out its pid. This attempts resolution via the PidFile, process name, control port, and control socket file. --- docs/change_log.rst | 1 + stem/control.py | 55 ++++++++++++++++++++++++ test/unit/control/controller.py | 89 ++++++++++++++++++++++++++++++++------- 3 files changed, 130 insertions(+), 15 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index d485071..cb0134e 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -40,6 +40,7 @@ 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`) diff --git a/stem/control.py b/stem/control.py index 6ec0006..a1a7ae4 100644 --- a/stem/control.py +++ b/stem/control.py @@ -24,6 +24,7 @@ providing its own for interacting at a higher level. |- get_exit_policy - provides our exit policy |- get_socks_listeners - provides where tor is listening for SOCKS connections |- get_protocolinfo - information about the controller interface + |- get_pid - provides the pid of our tor process | |- get_microdescriptor - querying the microdescriptor for a relay |- get_microdescriptors - provides all presently available microdescriptors @@ -152,6 +153,7 @@ import stem.socket import stem.util.connection import stem.util.enum import stem.util.str_tools +import stem.util.system import stem.util.tor_tools import stem.version @@ -992,6 +994,59 @@ class Controller(BaseController): else: return default + 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. + + :param object default: response if the query fails + + :returns: int with our process' pid + + :raises: **ValueError** if unable to determine the pid and no default was + 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: + 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_contents.isdigit(): + pid = int(pid_file_contents) + + if not pid: + pid = stem.util.system.get_pid_by_name('tor') + + if not pid: + control_socket = self.get_socket() + + if isinstance(control_socket, stem.socket.ControlPort): + pid = stem.util.system.get_pid_by_port(control_socket.get_port()) + elif isinstance(control_socket, stem.socket.ControlSocketFile): + pid = stem.util.system.get_pid_by_open_file(control_socket.get_socket_path()) + + if pid and self.is_caching_enabled(): + self._set_cache({"pid": pid}) + + if pid: + return pid + elif default == UNDEFINED: + raise ValueError("Unable to resolve tor's pid") + else: + return default + def get_microdescriptor(self, relay, default = UNDEFINED): """ Provides the microdescriptor for the relay with the given fingerprint or diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index 9efe4bf..ab89ac0 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -3,16 +3,20 @@ Unit tests for the stem.control module. The module's primarily exercised via integ tests, but a few bits lend themselves to unit testing. """ +import os +import tempfile import unittest import stem.descriptor.router_status_entry import stem.response import stem.socket +import stem.util.system import stem.version from stem import InvalidArguments, InvalidRequest, ProtocolError, UnsatisfiableRequest from stem.control import _parse_circ_path, Controller, EventType from stem.exit_policy import ExitPolicy +from stem.socket import ControlSocket from test import mocking @@ -215,63 +219,118 @@ class TestControl(unittest.TestCase): Exercises the get_protocolinfo() method. """ - # Use the handy mocked protocolinfo response. + # use the handy mocked protocolinfo response + mocking.mock(stem.connection.get_protocolinfo, mocking.return_value( mocking.get_protocolinfo_response() )) - # Compare the str representation of these object, because the class - # does not have, nor need, a direct comparison operator. - self.assertEqual(str(mocking.get_protocolinfo_response()), str(self.controller.get_protocolinfo())) - # Raise an exception in the stem.connection.get_protocolinfo() call. + # compare the str representation of these object, because the class + # does not have, nor need, a direct comparison operator + + self.assertEqual( + str(mocking.get_protocolinfo_response()), + str(self.controller.get_protocolinfo()) + ) + + # raise an exception in the stem.connection.get_protocolinfo() call + mocking.mock(stem.connection.get_protocolinfo, mocking.raise_exception(ProtocolError)) - # Get a default value when the call fails. + # get a default value when the call fails self.assertEqual( "default returned", self.controller.get_protocolinfo(default = "default returned") ) - # No default value, accept the error. + # no default value, accept the error + self.assertRaises(ProtocolError, self.controller.get_protocolinfo) + def test_get_pid_remote(self): + """ + Exercise the get_pid() method for a non-local socket. + """ + + mocking.mock_method(ControlSocket, "is_localhost", mocking.return_false()) + + self.assertRaises(ValueError, self.controller.get_pid) + self.assertEqual(123, self.controller.get_pid(123)) + + def test_get_pid_by_pid_file(self): + """ + Exercise the get_pid() resolution via a PidFile. + """ + + # It's a little inappropriate for us to be using tempfile in unit tests, + # but this is more reliable than trying to mock open(). + + mocking.mock_method(ControlSocket, "is_localhost", mocking.return_true()) + + pid_file_path = tempfile.mkstemp()[1] + + try: + with open(pid_file_path, 'w') as pid_file: + pid_file.write('321') + + mocking.mock_method(Controller, "get_conf", mocking.return_value(pid_file_path)) + self.assertEqual(321, self.controller.get_pid()) + finally: + os.remove(pid_file_path) + + def test_get_pid_by_name(self): + """ + Exercise the get_pid() resolution via the process name. + """ + + mocking.mock_method(ControlSocket, "is_localhost", mocking.return_true()) + mocking.mock(stem.util.system.get_pid_by_name, mocking.return_value(432)) + self.assertEqual(432, self.controller.get_pid()) + def test_get_network_status(self): """ Exercises the get_network_status() method. """ - # Build a single router status entry. + # build a single router status entry + nickname = "Beaver" fingerprint = "/96bKo4soysolMgKn5Hex2nyFSY" desc = "r %s %s u5lTXJKGsLKufRLnSyVqT7TdGYw 2012-12-30 22:02:49 77.223.43.54 9001 0\ns Fast Named Running Stable Valid\nw Bandwidth=75" % (nickname, fingerprint) router = stem.descriptor.router_status_entry.RouterStatusEntryV2(desc) - # Always return the same router status entry. + # always return the same router status entry + mocking.mock_method(Controller, "get_info", mocking.return_value(desc)) - # Pretend to get the router status entry with its name. + # pretend to get the router status entry with its name + self.assertEqual(router, self.controller.get_network_status(nickname)) - # Pretend to get the router status entry with its fingerprint. + # pretend to get the router status entry with its fingerprint + hex_fingerprint = stem.descriptor.router_status_entry._base64_to_hex(fingerprint, False) self.assertEqual(router, self.controller.get_network_status(hex_fingerprint)) - # Mangle hex fingerprint and try again. + # mangle hex fingerprint and try again + hex_fingerprint = hex_fingerprint[2:] self.assertRaises(ValueError, self.controller.get_network_status, hex_fingerprint) - # Raise an exception in the get_info() call. + # raise an exception in the get_info() call + mocking.mock_method(Controller, "get_info", mocking.raise_exception(InvalidArguments)) - # Get a default value when the call fails. + # get a default value when the call fails self.assertEqual( "default returned", self.controller.get_network_status(nickname, default = "default returned") ) - # No default value, accept the error. + # no default value, accept the error + self.assertRaises(InvalidArguments, self.controller.get_network_status, nickname) def test_event_listening(self):

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 27 May '13

27 May '13

commit 8ad18e206f783d3540e585412d8f8bc3ce895346 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 27 14:45:36 2013 +0000 Update translations for vidalia_help --- pl/config.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pl/config.po b/pl/config.po index a474854..11a24af 100644 --- a/pl/config.po +++ b/pl/config.po @@ -1,14 +1,15 @@ # # Translators: +# yodaa <slayer123312(a)gmail.com>, 2013 # bogdrozd <bog.d(a)gazeta.pl>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2013-04-29 09:25+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"PO-Revision-Date: 2013-05-27 14:20+0000\n" +"Last-Translator: yodaa <slayer123312(a)gmail.com>\n" +"Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -42,7 +43,7 @@ msgstr "Ustawienia Ogólne" #: en/config.html:29 msgid "" "Settings on the General page are the most commonly modified settings." -msgstr "" +msgstr "Ustawienia w Ogólny page are the most commonly modified settings." #. type: Content of: <html><body><ul><li> #: en/config.html:32

1 0

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

27 May '13

commit ddb1f07af90bc9e45c899c8c39e33c0d95e5edfe Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 27 14:15:28 2013 +0000 Update translations for vidalia_alpha --- si_LK/vidalia_si_LK.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/si_LK/vidalia_si_LK.po b/si_LK/vidalia_si_LK.po index 76d6c24..0b7b4e5 100644 --- a/si_LK/vidalia_si_LK.po +++ b/si_LK/vidalia_si_LK.po @@ -6,7 +6,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-27 13:40+0000\n" +"PO-Revision-Date: 2013-05-27 13:50+0000\n" "Last-Translator: Randika.Pathirage <randika.pathirage(a)gmail.com>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/torproject/language/si_LK/)\n" "MIME-Version: 1.0\n"

1 0