- tor-commits - lists.torproject.org

[translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed
by translation＠torproject.org 03 Apr '19

03 Apr '19

commit 2b181ef64880820d6d415bd1ce9d93eae25dd221 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 3 19:45:43 2019 +0000 Update translations for donatepages-messagespot_completed --- locale/pt_BR/LC_MESSAGES/messages.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po index 67f3bd21d..616407e5d 100644 --- a/locale/pt_BR/LC_MESSAGES/messages.po +++ b/locale/pt_BR/LC_MESSAGES/messages.po @@ -9,8 +9,8 @@ # Eduardo Bonsi, 2018 # erinm, 2018 # nilson t. c., 2018 -# Emma Peel, 2018 # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2019 +# Emma Peel, 2019 # Communia <ameaneantie(a)riseup.net>, 2019 # msgid "" @@ -926,7 +926,7 @@ msgstr "" "Você pode ler sobre os contribuidores centrais do Projeto Tor em nossa <a " "class=\"hyperlinks\" target=\"_blank\" " "href=\"https://www.torproject.org/about/corepeople.html.en\">página de Contribuidores Centrais</a>." +"class=\"links\">página de Contribuidores Principais</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:95 msgid "Who uses Tor?"

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 03 Apr '19

03 Apr '19

commit 6a8c7e0cb267791d22a75fc8886d2720e3e63880 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 3 19:45:36 2019 +0000 Update translations for donatepages-messagespot --- locale/pt_BR/LC_MESSAGES/messages.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po index 67f3bd21d..616407e5d 100644 --- a/locale/pt_BR/LC_MESSAGES/messages.po +++ b/locale/pt_BR/LC_MESSAGES/messages.po @@ -9,8 +9,8 @@ # Eduardo Bonsi, 2018 # erinm, 2018 # nilson t. c., 2018 -# Emma Peel, 2018 # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2019 +# Emma Peel, 2019 # Communia <ameaneantie(a)riseup.net>, 2019 # msgid "" @@ -926,7 +926,7 @@ msgstr "" "Você pode ler sobre os contribuidores centrais do Projeto Tor em nossa <a " "class=\"hyperlinks\" target=\"_blank\" " "href=\"https://www.torproject.org/about/corepeople.html.en\">página de Contribuidores Centrais</a>." +"class=\"links\">página de Contribuidores Principais</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:95 msgid "Who uses Tor?"

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 03 Apr '19

03 Apr '19

commit 4ff5f54e98e43957fe7652d10ec5ab30b73206d6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 3 18:17:54 2019 +0000 Update translations for tbmanual-contentspot --- contents+da.po | 58 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/contents+da.po b/contents+da.po index 0ca790cd8..c00ac358b 100644 --- a/contents+da.po +++ b/contents+da.po @@ -118,7 +118,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/about/ #: (content/about/contents+en-US.lrtopic.body) msgid "##### How Tor works" -msgstr "" +msgstr "##### Hvordan Tor virker" #: https//tb-manual.torproject.org/en-US/about/ #: (content/about/contents+en-US.lrtopic.body) @@ -191,7 +191,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) msgid "##### Mirrors" -msgstr "" +msgstr "##### Spejle" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) @@ -205,7 +205,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) msgid "##### GetTor" -msgstr "" +msgstr "##### GetTor" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) @@ -218,7 +218,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) msgid "###### To use GetTor via email:" -msgstr "" +msgstr "###### Brug GetTor via e-mail:" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) @@ -242,7 +242,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) msgid "###### To use GetTor via Twitter:" -msgstr "" +msgstr "###### Brug GetTor via Twitter:" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) @@ -255,7 +255,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) msgid "###### To use GetTor via Jabber/XMPP (Jitsi, CoyIM, etc.):" -msgstr "" +msgstr "###### Brug GetTor via Jabber/XMPP (Jitsi, CoyIM osv.):" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) @@ -287,7 +287,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/running-tor-browser/ #: (content/running-tor-browser/contents+en-US.lrtopic.body) msgid "##### Connect" -msgstr "" +msgstr "##### Opret forbindelse" #: https//tb-manual.torproject.org/en-US/running-tor-browser/ #: (content/running-tor-browser/contents+en-US.lrtopic.body) @@ -310,7 +310,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/running-tor-browser/ #: (content/running-tor-browser/contents+en-US.lrtopic.body) msgid "##### Configure" -msgstr "" +msgstr "##### Konfigurer" #: https//tb-manual.torproject.org/en-US/running-tor-browser/ #: (content/running-tor-browser/contents+en-US.lrtopic.body) @@ -392,7 +392,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/bridges/ #: (content/bridges/contents+en-US.lrtopic.body) msgid "##### Getting bridge addresses" -msgstr "" +msgstr "##### Henter broadresser" #: https//tb-manual.torproject.org/en-US/bridges/ #: (content/bridges/contents+en-US.lrtopic.body) @@ -781,7 +781,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) msgid "##### The URL bar" -msgstr "" +msgstr "##### URL-linjen" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) @@ -829,7 +829,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) msgid "##### Logging in over Tor" -msgstr "" +msgstr "##### Indlogning over Tor" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) @@ -880,7 +880,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) msgid "##### Changing identities and circuits" -msgstr "" +msgstr "##### Skift identitet og kredsløb" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) @@ -897,7 +897,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) msgid "###### New Identity" -msgstr "" +msgstr "###### Ny identitet" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) @@ -913,7 +913,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) msgid "###### New Tor circuit for this site" -msgstr "" +msgstr "###### Nyt Tor-kredsløb til stedet" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) @@ -987,7 +987,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/onion-services/ #: (content/onion-services/contents+en-US.lrtopic.body) msgid "##### How to access an onion service" -msgstr "" +msgstr "##### Tilgå en onion-adresse" #: https//tb-manual.torproject.org/en-US/onion-services/ #: (content/onion-services/contents+en-US.lrtopic.body) @@ -1010,7 +1010,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/onion-services/ #: (content/onion-services/contents+en-US.lrtopic.body) msgid "##### Troubleshooting" -msgstr "" +msgstr "##### Fejlfinding" #: https//tb-manual.torproject.org/en-US/onion-services/ #: (content/onion-services/contents+en-US.lrtopic.body) @@ -1105,7 +1105,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/secure-connections/ #: (content/secure-connections/contents+en-US.lrtopic.body) msgid "##### Potentially visible data" -msgstr "" +msgstr "##### Potentiel synlig data" #: https//tb-manual.torproject.org/en-US/secure-connections/ #: (content/secure-connections/contents+en-US.lrtopic.body) @@ -1240,7 +1240,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/security-slider/ #: (content/security-slider/contents+en-US.lrtopic.body) msgid "##### Accessing the Security Slider" -msgstr "" +msgstr "##### Tilgå sikkerhedsskyderen" #: https//tb-manual.torproject.org/en-US/security-slider/ #: (content/security-slider/contents+en-US.lrtopic.body) @@ -1260,7 +1260,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/security-settings/ #: (content/security-settings/contents+en-US.lrtopic.body) msgid "##### Security Levels" -msgstr "" +msgstr "##### Sikkerhedsniveauer" #: https//tb-manual.torproject.org/en-US/security-slider/ #: (content/security-slider/contents+en-US.lrtopic.body) @@ -1365,7 +1365,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/security-settings/ #: (content/security-settings/contents+en-US.lrtopic.body) msgid "##### Accessing the Security Settings" -msgstr "" +msgstr "##### Tilgå sikkerhedsindstillingerne" #: https//tb-manual.torproject.org/en-US/security-settings/ #: (content/security-settings/contents+en-US.lrtopic.body) @@ -1469,7 +1469,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/updating/ #: (content/updating/contents+en-US.lrtopic.body) msgid "##### Updating Tor Browser automatically" -msgstr "" +msgstr "##### Automatisk opdatering af Tor Browser" #: https//tb-manual.torproject.org/en-US/updating/ #: (content/updating/contents+en-US.lrtopic.body) @@ -1514,7 +1514,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/updating/ #: (content/updating/contents+en-US.lrtopic.body) msgid "##### Updating Tor Browser manually" -msgstr "" +msgstr "##### Manuel opdatering af Tor Browser" #: https//tb-manual.torproject.org/en-US/updating/ #: (content/updating/contents+en-US.lrtopic.body) @@ -1553,7 +1553,7 @@ msgstr "Sådan håndterer Tor Browser-tilføjelser, -plugins og -JavaScript" #: https//tb-manual.torproject.org/en-US/plugins/ #: (content/plugins/contents+en-US.lrtopic.body) msgid "##### Flash Player" -msgstr "" +msgstr "##### Flash-afspiller" #: https//tb-manual.torproject.org/en-US/plugins/ #: (content/plugins/contents+en-US.lrtopic.body) @@ -1580,7 +1580,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/plugins/ #: (content/plugins/contents+en-US.lrtopic.body) msgid "##### JavaScript" -msgstr "" +msgstr "##### JavaScript" #: https//tb-manual.torproject.org/en-US/plugins/ #: (content/plugins/contents+en-US.lrtopic.body) @@ -1623,7 +1623,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/plugins/ #: (content/plugins/contents+en-US.lrtopic.body) msgid "##### Browser Add-ons" -msgstr "" +msgstr "##### Browser-tilføjelser" #: https//tb-manual.torproject.org/en-US/plugins/ #: (content/plugins/contents+en-US.lrtopic.body) @@ -1663,7 +1663,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body) msgid "##### Quick fixes" -msgstr "" +msgstr "##### Hurtige rettelser" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body) @@ -1712,7 +1712,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body) msgid "##### Is your connection censored?" -msgstr "" +msgstr "##### Er din forbindelse censureret?" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body) @@ -1725,7 +1725,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body) msgid "##### Known issues" -msgstr "" +msgstr "##### Kendte problemer" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body) @@ -1899,6 +1899,8 @@ msgid "" "Trademark, copyright notices, and rules for use by third parties can be " "found in our " msgstr "" +"Varemærke, ophavsretsnotitser og regler for brug af tredjeparter findes i " +"vores " #: templates/layout.html:8 msgid "Tor Project | Tor Browser Manual"

1 0

[nyx/master] Use controller's get_start_time() method
by atagar＠torproject.org 03 Apr '19

03 Apr '19

commit 9835944a4fb3ab457733c3812b3fd4ba9c4bb6d1 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 3 10:20:23 2019 -0700 Use controller's get_start_time() method Tor just added a getinfo option to retrieve our uptime, so taking advantage of it here. As a new method naturally this is only present at the moment in the stem git repo. From a user perspective this should be transparent. Nyx will now present uptime when connected to a remote tor process and under the covers we make one fewer system calls, but that's about all. --- nyx/panel/header.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 2558b5e..370f3ee 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -277,7 +277,7 @@ class Sampling(object): 'auth_type': auth_type, 'pid': pid, - 'start_time': stem.util.system.start_time(pid), + 'start_time': controller.get_start_time(0), 'fd_limit': int(controller.get_info('process/descriptor-limit', '-1')), 'fd_used': fd_used,

1 0

[nyx/master] Nyx development version tag
by atagar＠torproject.org 03 Apr '19

03 Apr '19

commit f8ad2730ab5d85a302607524f0e9e10d640cf869 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 12 15:34:52 2019 -0800 Nyx development version tag --- nyx/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index 64cf220..f58a33d 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -89,7 +89,7 @@ except ImportError: sys.exit(1) -__version__ = '2.1.0' +__version__ = '2.1.0-dev' __release_date__ = 'January 12, 2019' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org'

1 0

[stem/master] Add a get_uptime() method
by atagar＠torproject.org 03 Apr '19

03 Apr '19

commit 0081c9a6122ac3fbb967da0f7228317f170eae38 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 2 11:03:02 2019 -0700 Add a get_uptime() method Taking advantage of our new getinfo option for determining the tor process runtime. https://trac.torproject.org/projects/tor/ticket/25132 https://gitweb.torproject.org/torspec.git/commit/?id=e9ef624 --- docs/change_log.rst | 1 + stem/control.py | 44 +++++++++++++++++++++++++++++++++++++++++ stem/version.py | 2 ++ test/unit/control/controller.py | 25 +++++++++++++++++++++++ 4 files changed, 72 insertions(+) diff --git a/docs/change_log.rst b/docs/change_log.rst index 89626ca4..5c0208cb 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -47,6 +47,7 @@ The following are only available within Stem's `git repository * **Controller** + * Added :func:`~stem.control.Controller.get_uptime` method to the :class:`~stem.control.Controller` * Controller events could fail to be delivered in a timely fashion (:trac:`27173`) * Adjusted :func:`~stem.control.Controller.get_microdescriptors` fallback to also use '.new' cache files (:trac:`28508`) * **DORMANT** and **ACTIVE** :data:`~stem.Signal` (:spec:`4421149`) diff --git a/stem/control.py b/stem/control.py index ce2d79a4..b4436af0 100644 --- a/stem/control.py +++ b/stem/control.py @@ -84,6 +84,7 @@ If you're fine with allowing your script to raise exceptions then this can be mo |- get_protocolinfo - information about the controller interface |- get_user - provides the user tor is running as |- get_pid - provides the pid of our tor process + |- get_uptime - duration tor has been running |- is_user_traffic_allowed - checks if we send or receive direct user traffic | |- get_microdescriptor - querying the microdescriptor for a relay @@ -1650,6 +1651,49 @@ class Controller(BaseController): else: raise ValueError("Unable to resolve tor's pid" if self.is_localhost() else "Tor isn't running locally") + @with_default() + def get_uptime(self, default = UNDEFINED): + """ + get_uptime(default = UNDEFINED) + + Provides the duration in seconds that tor has been running. + + .. versionadded:: 1.8.0 + + :param object default: response if the query fails + + :returns: **int** for the number of seconds tor has been running + + :raises: **ValueError** if unable to determine the uptime and no default + was provided + """ + + if self.get_version() >= stem.version.Requirement.GETINFO_UPTIME: + uptime = self.get_info('uptime', None) + + if uptime and uptime.isdigit(): + return int(uptime) + else: + raise ValueError("'GETINFO uptime' did not provide a valid numeric response: %s" % uptime) + else: + # Tor doesn't yet support this GETINFO option, attempt to determine the + # uptime of the process ourselves. + + if not self.is_localhost(): + raise ValueError('Unable to determine the uptime when tor is not running locally') + + pid = self.get_pid(None) + + if not pid: + raise ValueError('Unable to determine the pid of the tor process') + + start_time = stem.util.system.start_time(pid) + + if not start_time: + raise ValueError('Unable to determine when the tor process began') + + return time.time() - start_time + def is_user_traffic_allowed(self): """ Checks if we're likely to service direct user traffic. This essentially diff --git a/stem/version.py b/stem/version.py index 21dc3a0b..c13db22c 100644 --- a/stem/version.py +++ b/stem/version.py @@ -64,6 +64,7 @@ easily parsed and compared, for instance... **GETINFO_CONFIG_TEXT** 'GETINFO config-text' query **GETINFO_GEOIP_AVAILABLE** 'GETINFO ip-to-country/ipv4-available' query and its ipv6 counterpart **GETINFO_MICRODESCRIPTORS** 'GETINFO md/all' query + **GETINFO_UPTIME** 'GETINFO uptime' query **HIDDEN_SERVICE_V3** Support for v3 hidden services **HSFETCH** HSFETCH requests **HSFETCH_V3** HSFETCH for version 3 hidden services @@ -379,6 +380,7 @@ Requirement = stem.util.enum.Enum( ('GETINFO_CONFIG_TEXT', Version('0.2.2.7-alpha')), ('GETINFO_GEOIP_AVAILABLE', Version('0.3.2.1-alpha')), ('GETINFO_MICRODESCRIPTORS', Version('0.3.5.1-alpha')), + ('GETINFO_UPTIME', Version('0.3.5.1-alpha')), ('HIDDEN_SERVICE_V3', Version('0.3.3.1-alpha')), ('HSFETCH', Version('0.2.7.1-alpha')), ('HSFETCH_V3', Version('0.4.1.1-alpha')), diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index 13d26c4b..f5e63771 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -562,6 +562,31 @@ class TestControl(unittest.TestCase): self.assertEqual(432, self.controller.get_pid()) + @patch('stem.control.Controller.get_version', Mock(return_value = stem.version.Version('0.5.0.14'))) + @patch('stem.control.Controller.get_info') + def test_get_uptime_by_getinfo(self, getinfo_mock): + """ + Exercise the get_uptime() resolution via a GETINFO query. + """ + + getinfo_mock.return_value = '321' + self.assertEqual(321, self.controller.get_uptime()) + + getinfo_mock.return_value = 'abc' + self.assertRaisesWith(ValueError, "'GETINFO uptime' did not provide a valid numeric response: abc", self.controller.get_uptime) + + @patch('stem.socket.ControlSocket.is_localhost', Mock(return_value = True)) + @patch('stem.control.Controller.get_version', Mock(return_value = stem.version.Version('0.1.0.14'))) + @patch('stem.control.Controller.get_pid', Mock(return_value = '12')) + @patch('stem.util.system.start_time', Mock(return_value = 5000.0)) + @patch('time.time', Mock(return_value = 5200.0)) + def test_get_uptime_by_process(self): + """ + Exercise the get_uptime() resolution via process age. + """ + + self.assertEqual(200, self.controller.get_uptime()) + @patch('stem.control.Controller.get_info') def test_get_network_status_for_ourselves(self, get_info_mock): """

1 0

[stem/master] Add a get_start_time() method
by atagar＠torproject.org 03 Apr '19

03 Apr '19

commit 9b1897578aca4a8befda999efcc5ad64aaf646ed Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 2 11:05:22 2019 -0700 Add a get_start_time() method On reflection, process initialization time is cachable whereas uptime is not. Adding a get_start_time() method, not only for its own usefulness but because it inherrantly lets us make get_uptime() a cached method. --- docs/change_log.rst | 1 + stem/control.py | 72 +++++++++++++++++++++++++++++------------ test/unit/control/controller.py | 7 ++-- 3 files changed, 58 insertions(+), 22 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 5c0208cb..f188c885 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -47,6 +47,7 @@ The following are only available within Stem's `git repository * **Controller** + * Added :func:`~stem.control.Controller.get_start_time` method to the :class:`~stem.control.Controller` * Added :func:`~stem.control.Controller.get_uptime` method to the :class:`~stem.control.Controller` * Controller events could fail to be delivered in a timely fashion (:trac:`27173`) * Adjusted :func:`~stem.control.Controller.get_microdescriptors` fallback to also use '.new' cache files (:trac:`28508`) diff --git a/stem/control.py b/stem/control.py index b4436af0..3ea3752f 100644 --- a/stem/control.py +++ b/stem/control.py @@ -84,6 +84,7 @@ If you're fine with allowing your script to raise exceptions then this can be mo |- get_protocolinfo - information about the controller interface |- get_user - provides the user tor is running as |- get_pid - provides the pid of our tor process + |- get_start_time - timestamp when the tor process began |- get_uptime - duration tor has been running |- is_user_traffic_allowed - checks if we send or receive direct user traffic | @@ -1582,8 +1583,10 @@ class Controller(BaseController): user = self._get_cache('user') - if not user: - user = self.get_info('process/user', None) + if user: + return user + + user = self.get_info('process/user', None) if not user and self.is_localhost(): pid = self.get_pid(None) @@ -1618,11 +1621,13 @@ class Controller(BaseController): pid = self._get_cache('pid') - if not pid: - getinfo_pid = self.get_info('process/pid', None) + if pid: + return pid - if getinfo_pid and getinfo_pid.isdigit(): - pid = int(getinfo_pid) + getinfo_pid = self.get_info('process/pid', None) + + if getinfo_pid and getinfo_pid.isdigit(): + pid = int(getinfo_pid) if not pid and self.is_localhost(): pid_file_path = self.get_conf('PidFile', None) @@ -1652,30 +1657,37 @@ class Controller(BaseController): raise ValueError("Unable to resolve tor's pid" if self.is_localhost() else "Tor isn't running locally") @with_default() - def get_uptime(self, default = UNDEFINED): + def get_start_time(self, default = UNDEFINED): """ - get_uptime(default = UNDEFINED) + get_start_time(default = UNDEFINED) - Provides the duration in seconds that tor has been running. + Provides when the tor process began. .. versionadded:: 1.8.0 :param object default: response if the query fails - :returns: **int** for the number of seconds tor has been running + :returns: **float** for the unix timestamp of when the tor process began - :raises: **ValueError** if unable to determine the uptime and no default - was provided + :raises: **ValueError** if unable to determine when the process began and + no default was provided """ + start_time = self._get_cache('start_time') + + if start_time: + return start_time + if self.get_version() >= stem.version.Requirement.GETINFO_UPTIME: uptime = self.get_info('uptime', None) - if uptime and uptime.isdigit(): - return int(uptime) - else: - raise ValueError("'GETINFO uptime' did not provide a valid numeric response: %s" % uptime) - else: + if uptime: + if not uptime.isdigit(): + raise ValueError("'GETINFO uptime' did not provide a valid numeric response: %s" % uptime) + + start_time = time.time() - float(uptime) + + if not start_time and self.is_localhost(): # Tor doesn't yet support this GETINFO option, attempt to determine the # uptime of the process ourselves. @@ -1689,10 +1701,30 @@ class Controller(BaseController): start_time = stem.util.system.start_time(pid) - if not start_time: - raise ValueError('Unable to determine when the tor process began') + if start_time: + self._set_cache({'start_time': start_time}) + return start_time + else: + raise ValueError("Unable to resolve when tor began" if self.is_localhost() else "Tor isn't running locally") + + @with_default() + def get_uptime(self, default = UNDEFINED): + """ + get_uptime(default = UNDEFINED) + + Provides the duration in seconds that tor has been running. + + .. versionadded:: 1.8.0 + + :param object default: response if the query fails + + :returns: **float** for the number of seconds tor has been running + + :raises: **ValueError** if unable to determine the uptime and no default + was provided + """ - return time.time() - start_time + return time.time() - self.get_start_time() def is_user_traffic_allowed(self): """ diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index f5e63771..94c1b65f 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -563,14 +563,17 @@ class TestControl(unittest.TestCase): self.assertEqual(432, self.controller.get_pid()) @patch('stem.control.Controller.get_version', Mock(return_value = stem.version.Version('0.5.0.14'))) + @patch('stem.socket.ControlSocket.is_localhost', Mock(return_value = False)) @patch('stem.control.Controller.get_info') + @patch('time.time', Mock(return_value = 1000.0)) def test_get_uptime_by_getinfo(self, getinfo_mock): """ Exercise the get_uptime() resolution via a GETINFO query. """ getinfo_mock.return_value = '321' - self.assertEqual(321, self.controller.get_uptime()) + self.assertEqual(321.0, self.controller.get_uptime()) + self.controller.clear_cache() getinfo_mock.return_value = 'abc' self.assertRaisesWith(ValueError, "'GETINFO uptime' did not provide a valid numeric response: abc", self.controller.get_uptime) @@ -585,7 +588,7 @@ class TestControl(unittest.TestCase): Exercise the get_uptime() resolution via process age. """ - self.assertEqual(200, self.controller.get_uptime()) + self.assertEqual(200.0, self.controller.get_uptime()) @patch('stem.control.Controller.get_info') def test_get_network_status_for_ourselves(self, get_info_mock):

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 03 Apr '19

03 Apr '19

commit 4a9d151064e0718ee184139bd64d5e0deb6c5ca2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 3 17:47:54 2019 +0000 Update translations for tbmanual-contentspot --- contents+da.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+da.po b/contents+da.po index cc653d818..0ca790cd8 100644 --- a/contents+da.po +++ b/contents+da.po @@ -269,7 +269,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/running-tor-browser/ #: (content/running-tor-browser/contents+en-US.lrtopic.title) msgid "Running Tor Browser for the first time" -msgstr "Kører Tor Browser for første gang" +msgstr "Kør Tor Browser for første gang" #: https//tb-manual.torproject.org/en-US/running-tor-browser/ #: (content/running-tor-browser/contents+en-US.lrtopic.description) @@ -751,7 +751,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.title) msgid "Managing identities" -msgstr "Håndterings af identiteter" +msgstr "Håndtering af identiteter" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.description) @@ -937,7 +937,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/onion-services/ #: (content/onion-services/contents+en-US.lrtopic.title) msgid "Onion Services" -msgstr "" +msgstr "Onion-tjenester" #: https//tb-manual.torproject.org/en-US/onion-services/ #: (content/onion-services/contents+en-US.lrtopic.description) @@ -1442,7 +1442,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/updating/ #: (content/updating/contents+en-US.lrtopic.title) msgid "Updating" -msgstr "Opdaterer" +msgstr "Opdatering" #: https//tb-manual.torproject.org/en-US/updating/ #: (content/updating/contents+en-US.lrtopic.description) @@ -1825,7 +1825,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/uninstalling/ #: (content/uninstalling/contents+en-US.lrtopic.title) msgid "Uninstalling" -msgstr "Afinstallerer" +msgstr "Afinstallering" #: https//tb-manual.torproject.org/en-US/uninstalling/ #: (content/uninstalling/contents+en-US.lrtopic.description)

1 0

[doctor/master] Loosen netbsd package version parsing
by atagar＠torproject.org 03 Apr '19

03 Apr '19

commit 90777b92680fc56562cd3b58b9678b2244e83c8d Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 3 09:35:04 2019 -0700 Loosen netbsd package version parsing Recently netbsd changed its tor version to "0.3.5.8nb2"... http://pkgsrc.se/net/tor Clearly the 'nb2' suffix isn't part of our upstream version. I'm not entirely sure what it means (maybe a re-packaging of 0.3.5.8?). Adjusting the version parsing I use for netbsd to ignore it. --- package_versions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.py b/package_versions.py index ecb1e6f..da97d7e 100755 --- a/package_versions.py +++ b/package_versions.py @@ -23,7 +23,7 @@ AUR_VERSION = '<h2>Package Details: \S+ ([0-9\.]+)-\S+</h2>' FREEBSD_VERSION = 'SHA256 \(\S+-([0-9\.]+).tar.[gx]z\)' OPENBSD_DIST_VERSION = 'DISTNAME\s*=\s+\S+-([0-9\.]+)' OPENBSD_EGG_VERSION = 'MODPY_EGG_VERSION =\s+([0-9\.]+)' -NETBSD_VERSION = 'CURRENT, Version: ([0-9\.]+),' +NETBSD_VERSION = 'CURRENT, Version: ([0-9\.]+)[a-z0-9]*,' COLUMN = '| %-10s | %-10s | %-10s | %-50s |' DIV = '+%s+%s+%s+%s+' % ('-' * 12, '-' * 12, '-' * 12, '-' * 52)

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 03 Apr '19

03 Apr '19

commit 860ccf04c5f6eb16067486aecceb4de4dd675658 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 3 16:21:21 2019 +0000 Update translations for whisperback --- sw/sw.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sw/sw.po b/sw/sw.po index e20e66cf7..a0f788640 100644 --- a/sw/sw.po +++ b/sw/sw.po @@ -5,11 +5,11 @@ # Translators: msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-06-11 17:17+0200\n" -"PO-Revision-Date: 2018-08-07 08:48+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2012-02-26 16:11+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0