July 2020 - tor-commits - lists.torproject.org

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 19 Jul '20

19 Jul '20

commit 1690f5d14b810e827be489a1619ab089268975b9 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 19 13:45:16 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 0a3175dbee..892ef01ea4 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -1731,7 +1731,7 @@ msgid "" "* Does the hoster start to throttle bandwidth after a certain amount of " "traffic?" msgstr "" -"* იწყებს სივრცის მფლობელი გამტარუნარიანობის შეფერხება, გარკვეული ზღვრის " +"* იწყებს სივრცის მფლობელი გამტარუნარიანობის შეფერხებას, გარკვეული ზღვრის " "მიღწევის შემდგომ?" #: https//community.torproject.org/relay/technical-considerations/ @@ -4034,7 +4034,7 @@ msgstr "## ისაუბრეთ Tor-ზე" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.title) msgid "Relay Post-install and good practices" -msgstr "" +msgstr "გადამცემის გაშვების შემდგომი გამოცდილი რჩევები" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4677,7 +4677,7 @@ msgstr "გასვლა" #: https//community.torproject.org/relay/setup/exit/ #: (content/relay-operations/technical-setup/exit/contents+en.lrpage.subtitle) msgid "How to deploy an Exit node" -msgstr "" +msgstr "როგორ უნდა გაიწყოს გამსვლელი წერტილი" #: https//community.torproject.org/relay/setup/exit/ #: (content/relay-operations/technical-setup/exit/contents+en.lrpage.body) @@ -5134,6 +5134,8 @@ msgstr "ხიდი" #: (content/relay-operations/technical-setup/bridge/contents+en.lrpage.subtitle) msgid "Run an obfs4 bridge to help censored users connect to the Tor network" msgstr "" +"obfs4-ხიდის გაშვება, ცენზურის ქვეს მყოფი ხალხის დასახმარებლად, Tor-თან " +"კავშირისთვის" #: https//community.torproject.org/relay/setup/bridge/ #: (content/relay-operations/technical-setup/bridge/contents+en.lrpage.body) @@ -5164,12 +5166,12 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/ #: (content/relay-operations/technical-setup/guard/contents+en.lrpage.title) msgid "Middle/Guard relay" -msgstr "" +msgstr "შუა/მცველი გადამცემი" #: https//community.torproject.org/relay/setup/guard/ #: (content/relay-operations/technical-setup/guard/contents+en.lrpage.subtitle) msgid "Run a Middle/Guard relay" -msgstr "" +msgstr "შუა/მცველი გადამცემის გაშვება" #: https//community.torproject.org/relay/setup/guard/ #: (content/relay-operations/technical-setup/guard/contents+en.lrpage.body) @@ -5177,6 +5179,8 @@ msgid "" "In this guide we describe how to setup a new Middle/Guard relay. Please " "choose your platform below." msgstr "" +"ამ სახელმძღვანელოში აღწერილია, როგორ უნდა გაიმართოს შუა/მცველი გადამცემი. " +"გთხოვთ აირჩიოთ თქვენი პლატფორმა ქვემოთ." #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ #: (content/relay-operations/community-resources/tor-abuse-templates/contents+en.lrpage.title) @@ -7883,7 +7887,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.subtitle) msgid "How to deploy an obfs4 bridge on NetBSD" -msgstr "" +msgstr "როგორ უნდა განთავსდეს obfs4-ხიდი გადამცემი NetBSD-ზე" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -8552,7 +8556,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.subtitle) msgid "How to deploy an obfs4 bridge on Debian / Ubuntu" -msgstr "" +msgstr "როგორ უნდა განთავსდეს obs4-ხიდი Debian / Ubuntu-ზე" #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body) @@ -8820,7 +8824,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.subtitle) msgid "How to deploy an obfs4 bridge on DragonflyBSD" -msgstr "" +msgstr "როგორ უნდა განთავსდეს obfs4-ხიდი გადამცემი DragonflyBSD-ზე" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -9359,6 +9363,7 @@ msgstr "" #: (content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents+en.lrpage.subtitle) msgid "How to deploy an obfs4 bridge on CentOS / RHEL / OpenSUSE" msgstr "" +"როგორ უნდა განთავსდეს obfs4-ხიდი გადამცემი CentOS / RHEL / OpenSUSE-ზე" #: https//community.torproject.org/relay/setup/bridge/centos-rhel-opensuse/ #: (content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents+en.lrpage.body) @@ -9488,7 +9493,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/fedora/ #: (content/relay-operations/technical-setup/bridge/fedora/contents+en.lrpage.subtitle) msgid "How to deploy an obfs4 bridge on Fedora" -msgstr "" +msgstr "როგორ უნდა განთავსდეს obfs4-ხიდი გადამცემი Fedora-ზე" #: https//community.torproject.org/relay/setup/bridge/fedora/ #: (content/relay-operations/technical-setup/bridge/fedora/contents+en.lrpage.body) @@ -9520,7 +9525,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/freebsd/ #: (content/relay-operations/technical-setup/bridge/freebsd/contents+en.lrpage.subtitle) msgid "How to deploy an obfs4 bridge on FreeBSD" -msgstr "" +msgstr "როგორ უნდა განთავსდეს obfs4-ხიდი გადამცემი FreeBSD-ზე" #: https//community.torproject.org/relay/setup/bridge/freebsd/ #: (content/relay-operations/technical-setup/bridge/freebsd/contents+en.lrpage.body) @@ -9665,7 +9670,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/openbsd/ #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.subtitle) msgid "How to deploy an obfs4 bridge on OpenBSD" -msgstr "" +msgstr "როგორ უნდა განთავსდეს obfs4-ხიდი გადამცემი OpenBSD-ზე" #: https//community.torproject.org/relay/setup/bridge/openbsd/ #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.body) @@ -9732,7 +9737,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/netbsd/ #: (content/relay-operations/technical-setup/guard/netbsd/contents+en.lrpage.subtitle) msgid "How to deploy a Middle/Guard relay on NetBSD" -msgstr "" +msgstr "როგორ უნდა განთავსდეს შუა/მცველი გადამცემი NetBSD-ზე" #: https//community.torproject.org/relay/setup/guard/netbsd/ #: (content/relay-operations/technical-setup/guard/netbsd/contents+en.lrpage.body) @@ -9847,7 +9852,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/dragonflybsd/ #: (content/relay-operations/technical-setup/guard/dragonflybsd/contents+en.lrpage.subtitle) msgid "How to deploy a Middle/Guard relay on DragonflyBSD" -msgstr "" +msgstr "როგორ უნდა განთავსდეს შუა/მცველი გადამცემი DragonflyBSD-ზე" #: https//community.torproject.org/relay/setup/guard/dragonflybsd/ #: (content/relay-operations/technical-setup/guard/dragonflybsd/contents+en.lrpage.body) @@ -9914,6 +9919,8 @@ msgid "" "This is a very simple version of the `torrc` configuration file in order to " "run a Middle/Guard relay on the Tor network:" msgstr "" +"ესაა, მარტივი ვარიანტი `torrc` ფაილის, შუა/მცველი გადამცემის გასაშვებად Tor-" +"ქსელში." #: https//community.torproject.org/relay/setup/guard/dragonflybsd/ #: (content/relay-operations/technical-setup/guard/dragonflybsd/contents+en.lrpage.body) @@ -9949,7 +9956,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/centosrhel/ #: (content/relay-operations/technical-setup/guard/centosrhel/contents+en.lrpage.subtitle) msgid "How to deploy a middle/Guard relay on CentOS/RHEL" -msgstr "" +msgstr "როგორ უნდა განთავსდეს შუა/მცველი გადამცემი CentOS/RHEL-ზე" #: https//community.torproject.org/relay/setup/guard/centosrhel/ #: (content/relay-operations/technical-setup/guard/centosrhel/contents+en.lrpage.body) @@ -10125,7 +10132,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/fedora/ #: (content/relay-operations/technical-setup/guard/fedora/contents+en.lrpage.subtitle) msgid "How to deploy a middle/Guard relay on Fedora" -msgstr "" +msgstr "როგორ უნდა განთავსდეს შუა/მცველი გადამცემი Fedora-ზე" #: https//community.torproject.org/relay/setup/guard/fedora/ #: (content/relay-operations/technical-setup/guard/fedora/contents+en.lrpage.body) @@ -10160,7 +10167,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/debianubuntu/ #: (content/relay-operations/technical-setup/guard/debianubuntu/contents+en.lrpage.subtitle) msgid "How to deploy a middle/Guard relay on Debian/Ubuntu" -msgstr "" +msgstr "როგორ უნდა განთავსდეს შუა/მცველი გადამცემი Debian/Ubuntu-ზე" #: https//community.torproject.org/relay/setup/guard/debianubuntu/ #: (content/relay-operations/technical-setup/guard/debianubuntu/contents+en.lrpage.body) @@ -10227,7 +10234,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/freebsd/ #: (content/relay-operations/technical-setup/guard/freebsd/contents+en.lrpage.subtitle) msgid "How to deploy a Middle/Guard relay on FreeBSD" -msgstr "" +msgstr "როგორ უნდა განთავსდეს შუა/მცველი გადამცემი FreeBSD-ზე" #: https//community.torproject.org/relay/setup/guard/freebsd/ #: (content/relay-operations/technical-setup/guard/freebsd/contents+en.lrpage.body) @@ -10338,7 +10345,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.subtitle) msgid "How to deploy a Middle/Guard relay on OpenBSD" -msgstr "" +msgstr "როგორ უნდა განთავსდეს შუა/მცველი გადამცემი OpenBSD-ზე" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 19 Jul '20

19 Jul '20

commit aabf1a17b81f7604eb0c7f19530ee6827325dd2a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 19 13:17:50 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ka.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 5e31c97a17..faf67d6941 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -4480,9 +4480,9 @@ msgid "" "(\"≡\")](../../glossary/hamburger-menu), then click on \"Preferences\", and " "finally on \"Tor\" in the side bar." msgstr "" -"როცა ვერ ხედავთ ამ პარამეტრს და Tor-ბრაუზერი გაშვებულია, შეგიძლია გადახვიდეთ" -" [მთავარ მენიუში („≡“)](../../glossary/hamburger-menu), დაწკაპოთ " -"„პარამეტრები“ და შემდეგ „Tor“ გვერდით ზოლზე." +"როცა ვერ ხედავთ ამ პარამეტრს და Tor-ბრაუზერი გაშვებულია, შეგიძლიათ " +"გადახვიდეთ [მთავარ მენიუში (\"≡\")](../../glossary/hamburger-menu), დაწკაპოთ" +" „პარამეტრები“ და შემდეგ „Tor“ გვერდით ზოლზე." #: https//support.torproject.org/tbb/tbb-21/ #: (content/tbb/tbb-21/contents+en.lrquestion.description)

1 0

[stem/master] Tor manual url changed
by atagar＠torproject.org 19 Jul '20

19 Jul '20

commit a3eab95d6a888e002c8a6695dcc0556f22ccd2f5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 18 15:39:54 2020 -0700 Tor manual url changed Tor moved this file into a 'man' directory. Updating the url. This addresses the following test failure... ====================================================================== FAIL: test_attributes ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/integ/manual.py", line 154, in test_attributes self.requires_downloaded_manual() File "/home/atagar/Desktop/stem/test/integ/manual.py", line 97, in requires_downloaded_manual self.fail(self.download_error) AssertionError: Unable to download the man page: Unable to download tor's manual from https://gitweb.torproject.org/tor.git/plain/doc/tor.1.txt to /tmp/tmpsqm54_lg/tor.1.txt: HTTP Error 404: Not found --- stem/manual.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/manual.py b/stem/manual.py index b98f601c..2ce5a6ff 100644 --- a/stem/manual.py +++ b/stem/manual.py @@ -67,7 +67,7 @@ import stem.util.system from typing import Any, BinaryIO, Dict, List, Mapping, Optional, Sequence, Tuple, Union Category = stem.util.enum.Enum('GENERAL', 'CLIENT', 'RELAY', 'DIRECTORY', 'AUTHORITY', 'HIDDEN_SERVICE', 'DENIAL_OF_SERVICE', 'TESTING', 'UNKNOWN') -GITWEB_MANUAL_URL = 'https://gitweb.torproject.org/tor.git/plain/doc/tor.1.txt' +GITWEB_MANUAL_URL = 'https://gitweb.torproject.org/tor.git/plain/doc/man/tor.1.txt' CACHE_PATH = os.path.join(os.path.dirname(__file__), 'cached_manual.sqlite') DATABASE = None # cache database connections HAS_ENCODING_ARG = not stem.util.system.is_mac() and not stem.util.system.is_bsd() and not stem.util.system.is_slackware()

1 0

[stem/master] Synchronize manual cache
by atagar＠torproject.org 19 Jul '20

19 Jul '20

commit 950895c9b35d6f6ea3ec24d3b9cb078bf4976a98 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 18 16:14:13 2020 -0700 Synchronize manual cache Re-sync our manual cache with tor and correct a few issues with regard to python 3 and asyncio compatibility. --- cache_manual.py | 4 ++-- stem/cached_manual.sqlite | Bin 252928 -> 253952 bytes stem/manual.py | 6 +++++- test/integ/manual.py | 42 ++++++++++++++++++++++++++++++++++++------ 4 files changed, 43 insertions(+), 9 deletions(-) diff --git a/cache_manual.py b/cache_manual.py index 5bc68b57..803197f1 100755 --- a/cache_manual.py +++ b/cache_manual.py @@ -14,12 +14,12 @@ import stem.manual import stem.util.system GITWEB_MAN_LOG = 'https://gitweb.torproject.org/tor.git/log/doc/tor.1.txt' -MAN_LOG_LINK = "href='/tor.git/commit/doc/tor.1.txt\\?id=([^']*)'" +MAN_LOG_LINK = b"href='/tor.git/commit/doc/tor.1.txt\\?id=([^']*)'" if __name__ == '__main__': try: man_log_page = urllib.request.urlopen(GITWEB_MAN_LOG).read() - man_commit = re.search(MAN_LOG_LINK, man_log_page).group(1) + man_commit = re.search(MAN_LOG_LINK, man_log_page).group(1).decode('utf-8') except: print("Unable to determine the latest commit to edit tor's man page: %s" % sys.exc_info()[1]) sys.exit(1) diff --git a/stem/cached_manual.sqlite b/stem/cached_manual.sqlite index a2d9b02c..c967dd32 100644 Binary files a/stem/cached_manual.sqlite and b/stem/cached_manual.sqlite differ diff --git a/stem/manual.py b/stem/manual.py index 2ce5a6ff..0376d112 100644 --- a/stem/manual.py +++ b/stem/manual.py @@ -66,7 +66,7 @@ import stem.util.system from typing import Any, BinaryIO, Dict, List, Mapping, Optional, Sequence, Tuple, Union -Category = stem.util.enum.Enum('GENERAL', 'CLIENT', 'RELAY', 'DIRECTORY', 'AUTHORITY', 'HIDDEN_SERVICE', 'DENIAL_OF_SERVICE', 'TESTING', 'UNKNOWN') +Category = stem.util.enum.Enum('GENERAL', 'CLIENT', 'CIRCUIT_TIMEOUT', 'DORMANT_MODE', 'NODE_SELECTION', 'RELAY', 'STATISTIC', 'DIRECTORY', 'AUTHORITY', 'HIDDEN_SERVICE', 'DENIAL_OF_SERVICE', 'TESTING', 'UNKNOWN') GITWEB_MANUAL_URL = 'https://gitweb.torproject.org/tor.git/plain/doc/man/tor.1.txt' CACHE_PATH = os.path.join(os.path.dirname(__file__), 'cached_manual.sqlite') DATABASE = None # cache database connections @@ -87,7 +87,11 @@ SCHEMA = ( CATEGORY_SECTIONS = collections.OrderedDict(( ('GENERAL OPTIONS', Category.GENERAL), ('CLIENT OPTIONS', Category.CLIENT), + ('CIRCUIT TIMEOUT OPTIONS', Category.CIRCUIT_TIMEOUT), + ('DORMANT MODE OPTIONS', Category.DORMANT_MODE), + ('NODE SELECTION OPTIONS', Category.NODE_SELECTION), ('SERVER OPTIONS', Category.RELAY), + ('STATISTICS OPTIONS', Category.STATISTIC), ('DIRECTORY SERVER OPTIONS', Category.DIRECTORY), ('DIRECTORY AUTHORITY SERVER OPTIONS', Category.AUTHORITY), ('HIDDEN SERVICE OPTIONS', Category.HIDDEN_SERVICE), diff --git a/test/integ/manual.py b/test/integ/manual.py index 3e721ac6..c80e517c 100644 --- a/test/integ/manual.py +++ b/test/integ/manual.py @@ -14,6 +14,7 @@ import test import test.runner from stem.manual import Category +from stem.util.test_tools import async_test EXPECTED_CATEGORIES = set([ 'NAME', @@ -23,7 +24,11 @@ EXPECTED_CATEGORIES = set([ 'THE CONFIGURATION FILE FORMAT', 'GENERAL OPTIONS', 'CLIENT OPTIONS', + 'CIRCUIT TIMEOUT OPTIONS', + 'DORMANT MODE OPTIONS', + 'NODE SELECTION OPTIONS', 'SERVER OPTIONS', + 'STATISTICS OPTIONS', 'DIRECTORY SERVER OPTIONS', 'DIRECTORY AUTHORITY SERVER OPTIONS', 'HIDDEN SERVICE OPTIONS', @@ -38,7 +43,30 @@ EXPECTED_CATEGORIES = set([ 'AUTHORS', ]) -EXPECTED_CLI_OPTIONS = set(['-f FILE', '--hash-password PASSWORD', '--ignore-missing-torrc', '--defaults-torrc FILE', '--key-expiration [purpose]', '--list-fingerprint', '--list-deprecated-options', '--allow-missing-torrc', '--nt-service', '--verify-config', '--dump-config short|full|non-builtin', '--service remove|start|stop', '--passphrase-fd FILEDES', '--keygen [--newpass]', '--list-torrc-options', '--service install [--options command-line options]', '--list-modules', '--quiet|--hush', '--version', '-h, --help']) +EXPECTED_CLI_OPTIONS = set([ + '--allow-missing-torrc', + '--dbg-...', + '--defaults-torrc FILE', + '--dump-config short|full', + '--hash-password PASSWORD', + '--ignore-missing-torrc', + '--key-expiration [purpose]', + '--keygen [--newpass]', + '--list-deprecated-options', + '--list-fingerprint', + '--list-modules', + '--list-torrc-options', + '--nt-service', + '--passphrase-fd FILEDES', + '--quiet|--hush', + '--service install [--options command-line options]', + '--service remove|start|stop', + '--verify-config', + '--version', + '-f FILE', + '-h, --help', +]) + EXPECTED_SIGNALS = set(['SIGTERM', 'SIGINT', 'SIGHUP', 'SIGUSR1', 'SIGUSR2', 'SIGCHLD', 'SIGPIPE', 'SIGXFSZ']) EXPECTED_DESCRIPTION = """ @@ -216,20 +244,22 @@ class TestManual(unittest.TestCase): self.assertEqual(['tor - The second-generation onion router'], categories['NAME']) self.assertEqual(['tor [OPTION value]...'], categories['SYNOPSIS']) - def test_has_all_tor_config_options(self): + @async_test + async def test_has_all_tor_config_options(self): """ Check that all the configuration options tor supports are in the man page. """ self.requires_downloaded_manual() - with test.runner.get_runner().get_tor_controller() as controller: - config_options_in_tor = set([line.split()[0] for line in controller.get_info('config/names').splitlines() if line.split()[1] != 'Virtual']) + async with await test.runner.get_runner().get_tor_controller() as controller: + config_options_in_tor = set([line.split()[0] for line in (await controller.get_info('config/names')).splitlines() if line.split()[1] != 'Virtual']) - # options starting with an underscore are hidden by convention + # options starting with an underscore are hidden by convention, but the + # manual includes OwningControllerProcess for name in list(config_options_in_tor): - if name.startswith('_'): + if name.startswith('_') and name != '__OwningControllerProcess': config_options_in_tor.remove(name) manual = stem.manual.Manual.from_man(self.man_path)

1 0

[chutney/master] update chutney readme; specify that we need python 3
by nickm＠torproject.org 18 Jul '20

18 Jul '20

commit 67f83d770c6e3da5e3b1a72a0314c495d62fb21f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 10 07:07:29 2020 -0400 update chutney readme; specify that we need python 3 --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 0f3c343..dca19d3 100644 --- a/README +++ b/README @@ -10,7 +10,7 @@ It is supposed to be a good tool for: Right now it only sorta does these things. You will need: - - Python 2.7, or a supported Python 3, + - A supported version of Python 3 - (we support Python versions that are still getting updates), and - Tor binaries.

1 0

[chutney/master] Merge branch 'ticket-40002-plus-squashed'
by nickm＠torproject.org 18 Jul '20

18 Jul '20

commit f05a15fa61664756925cd6dd74a0a26914598b78 Merge: 99bd06c 67f83d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jul 18 11:41:17 2020 -0400 Merge branch 'ticket-40002-plus-squashed' .travis.yml | 33 ++-------- README | 2 +- chutney | 20 +++++- lib/chutney/Templating.py | 18 +++--- lib/chutney/TorNet.py | 151 ++++++++++++++++++++++------------------------ 5 files changed, 104 insertions(+), 120 deletions(-) diff --cc lib/chutney/TorNet.py index 37bef04,123fc50..2d219ac --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@@ -1260,56 -1254,14 +1256,56 @@@ class LocalNodeController(NodeControlle SHORT_FILE_CODE = -100 NO_PROGRESS_CODE = 0 SUCCESS_CODE = 100 + ONIONDESC_PUBLISHED_CODE = 200 + HSV2_KEYWORD = "hidden service v2" + HSV3_KEYWORD = "hidden service v3" - def getLastBootstrapStatus(self): - """Look through the logs and return the last bootstrap message - received as a 3-tuple of percentage complete, keyword - (optional), and message. + def updateLastOnionServiceDescStatus(self): + """Look through the logs and cache the last onion service + descriptor status received. + """ + logfname = self.getLogfile(info=True) + if not os.path.exists(logfname): + return (LocalNodeController.MISSING_FILE_CODE, + "no_logfile", "There is no logfile yet.") + percent = LocalNodeController.NO_RECORDS_CODE + keyword = "no_message" + message = "No onion service descriptor messages yet." + with open(logfname, 'r') as f: + for line in f: + m_v2 = re.search(r'Launching upload for hidden service (.*)', + line) + if m_v2: + percent = LocalNodeController.ONIONDESC_PUBLISHED_CODE + keyword = LocalNodeController.HSV2_KEYWORD + message = m_v2.groups()[0] + break + # else check for HSv3 + m_v3 = re.search(r'Service ([^\s]+ [^\s]+ descriptor of revision .*)', + line) + if m_v3: + percent = LocalNodeController.ONIONDESC_PUBLISHED_CODE + keyword = LocalNodeController.HSV3_KEYWORD + message = m_v3.groups()[0] + break + self.most_recent_oniondesc_status = (percent, keyword, message) + + def getLastOnionServiceDescStatus(self): + """Return the last onion descriptor message fetched by + updateLastOnionServiceDescStatus as a 3-tuple of percentage + complete, the hidden service version, and message. + + The return status depends on the last time updateLastStatus() + was called; that function must be called before this one. + """ + return self.most_recent_oniondesc_status + + def updateLastBootstrapStatus(self): + """Look through the logs and cache the last bootstrap message + received. """ logfname = self.getLogfile() - if not os.path.exists(logfname): + if not logfname.exists(): return (LocalNodeController.MISSING_FILE_CODE, "no_logfile", "There is no logfile yet.") percent = LocalNodeController.NO_RECORDS_CODE

1 0

[chutney/master] Update "chutney" shell script to search only for python 3.
by nickm＠torproject.org 18 Jul '20

18 Jul '20

commit 8dd373ba78d8aaa191273bcbea277d1df25ed43d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 14:58:25 2020 -0400 Update "chutney" shell script to search only for python 3. --- chutney | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/chutney b/chutney index 63f9a47..b53e2d0 100755 --- a/chutney +++ b/chutney @@ -12,7 +12,15 @@ then export CHUTNEY_PATH fi -binaries="python3 python python2" +python_ok () +{ + checkpy="$1" + test -f "${checkpy}" && \ + test -x "${checkpy}" && \ + "${checkpy}" -c 'import sys;sys.exit(sys.version_info[0]<3)' +} + +binaries="python3 python" if ! test "${PYTHON+y}" then @@ -31,7 +39,7 @@ then ;; esac abs_path="${directory}${binary}" - if test -f "${abs_path}" && test -x "${abs_path}" + if python_ok "${abs_path}" then PYTHON="${abs_path}" break @@ -44,12 +52,18 @@ then fi done IFS="${saved_IFS}" +else + if ! python_ok "$(command -v "${PYTHON}")" + then + echo "Python in \$PYTHON envvar (\"$PYTHON\") is not present, or is not python 3." >&2 + exit 1 + fi fi if ! test "${PYTHON+y}" then printf "No compatible Python version found.\n" >&2 - printf "Is Python installed and in your PATH?\n" >&2 + printf "Is python 3 installed and in your PATH?\n" >&2 exit 1 fi

1 0

[chutney/master] Try setting python version to python 3 in travis.
by nickm＠torproject.org 18 Jul '20

18 Jul '20

commit 743939acc3f4cbeb570b229c94ccc3e25c7e78e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 14:44:12 2020 -0400 Try setting python version to python 3 in travis. --- .travis.yml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff8f540..fca1820 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: python # The default python version on Travis is 2.7 # But we add this line to show the python version in the Travis UI -python: "2.7" +python: "3.8" os: - linux @@ -30,7 +30,7 @@ env: - TOR="master-nightly" NETWORK_FLAVOUR="basic-min" matrix: - # include creates Linux, python 2.7, tor master builds by default + # include creates Linux, python 3.8, tor master builds by default # we use tor master to catch tor issues before stable releases # the key(s) in each item override these defaults include: @@ -39,9 +39,6 @@ matrix: ## ## We need to use macOS to test IPv6 networks, because Travis Linux doesn't ## support IPv6. But macOS is tricky: - ## - We use the default python version on macOS, which is currently 2.7. - ## (But we don't show the version, because Travis might change it - ## without us noticing.) ## - We use language: c, because language: python fails on Travis macOS. ## - We get the tor version in the homebrew cache on the macOS image. ## The latest tor version in homebrew is on this page: @@ -63,19 +60,19 @@ matrix: ## ## IPv6 networks (on macOS) ## "make test-network-all" on all supported tor versions - - env: TOR="stable-release" NETWORK_FLAVOUR="bridges+ipv6-min" + - env: PYTHON="python3" TOR="stable-release" NETWORK_FLAVOUR="bridges+ipv6-min" os: osx language: c python: ## The IPv6 exit test doesn't actually require IPv6, see #30182. ## But we'll keep this test, because it does test IPv6 exit config. - env: TOR="master-nightly" NETWORK_FLAVOUR="ipv6-exit-min" - - env: TOR="stable-release" NETWORK_FLAVOUR="hs-v23-ipv6-md" + - env: PYTHON="python3" TOR="stable-release" NETWORK_FLAVOUR="hs-v23-ipv6-md" os: osx language: c python: ## v3 onion service IPv6 tests - - env: TOR="stable-release" NETWORK_FLAVOUR="single-onion-v23-ipv6-md" + - env: PYTHON="python3" TOR="stable-release" NETWORK_FLAVOUR="single-onion-v23-ipv6-md" os: osx language: c python: @@ -140,10 +137,6 @@ matrix: ## Pre-installed in Travis Bionic: ## https://docs.travis-ci.com/user/reference/bionic/#python-support - ## End of Life: 1 January 2020 - ## https://www.python.org/dev/peps/pep-0373/#update - - python: "2.7" - ## End of Life: December 2021 ## https://www.python.org/dev/peps/pep-0494/#lifespan - python: "3.6"

1 0

[chutney/master] Remove pypy (2) testcase.
by nickm＠torproject.org 18 Jul '20

18 Jul '20

commit ee941f88c297d0c86478013118ac7dd311169e9a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 10 07:05:16 2020 -0400 Remove pypy (2) testcase. --- .travis.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index fca1820..0179600 100644 --- a/.travis.yml +++ b/.travis.yml @@ -167,22 +167,6 @@ matrix: ## Tor master doesn't work on Travis Xenial, because it only has ## OpenSSL 1.1.0 - ## Pypy 2 - ## End of Life: "forever" - ## http://doc.pypy.org/en/latest/faq.html#how-long-will-pypy-support-python2 - ## But chutney can decide not to support python 2 after 1 Jan 2020. - - python: "pypy" - dist: xenial - addons: - apt: - sources: - - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.4.2.x-xenial main' - key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' - packages: - - shellcheck - - tor - env: TOR="0.4.2-nightly" NETWORK_FLAVOUR="basic-min" - ## PyPy does not have documented end of life dates - python: "pypy3" dist: xenial

1 0

[chutney/master] TorNet: replace for loop with list comprehension
by nickm＠torproject.org 18 Jul '20

18 Jul '20

commit bc7abead8e2be29bc89d485cb86c01b92c5165b1 Author: c <c(a)chroniko.jp> Date: Sun Jul 5 08:09:31 2020 +0000 TorNet: replace for loop with list comprehension seems easier to read --- lib/chutney/TorNet.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index b19c2f2..f31b254 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -2540,13 +2540,11 @@ def ConfigureNodes(nodelist): network._dfltEnv['hasbridgeauth'] = True def getTests(): - tests = [] chutney_path = get_absolute_chutney_path() chutney_tests_path = chutney_path / "scripts" / "chutney_tests" - for x in chutney_tests_path.glob("*.py"): - if not x.startswith("_"): - tests.append(x.with_suffix("")) - return tests + + return [test.name for test in chutney_tests_path.glob("*.py") + if not test.name.startswith("_")] def usage(network):

1 0