February 2021 - tor-commits - lists.torproject.org

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 19 Feb '21

19 Feb '21

commit 36877312337b44d34ff7b1649cadc84aceb4df26 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 19 20:46:27 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- cs.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cs.po b/cs.po index f98d5c3da2..a6690d26de 100644 --- a/cs.po +++ b/cs.po @@ -8,6 +8,7 @@ # David Nowak <user412(a)secmail.pro>, 2020 # Filip Hruska <fhr(a)fhrnet.eu>, 2014 # Fourdee Foureight, 2020 +# Jan Pechacek <jan386(a)gmail.com>, 2021 # Pivoj, 2015 # Jiří Vírava <appukonrad(a)gmail.com>, 2013-2014 # trendspotter, 2019 @@ -25,8 +26,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-05 11:44+0100\n" -"PO-Revision-Date: 2021-01-05 12:15+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-02-19 20:33+0000\n" +"Last-Translator: Jan Pechacek <jan386(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 19 Feb '21

19 Feb '21

commit 0c7fe16a46a28fa2150c38cc40e4763d859ecd99 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 19 20:45:48 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- cs.po | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/cs.po b/cs.po index 6c72b74485..9787b09f87 100644 --- a/cs.po +++ b/cs.po @@ -7,7 +7,8 @@ # Adam Slovacek <adamslovacek(a)gmail.com>, 2013 # David Nowak <user412(a)secmail.pro>, 2020 # Filip Hruska <fhr(a)fhrnet.eu>, 2014 -# Fourdee Foureight <x4D48(a)protonmail.ch>, 2020 +# Fourdee Foureight, 2020 +# Jan Pechacek <jan386(a)gmail.com>, 2021 # Pivoj, 2015 # Jiří Vírava <appukonrad(a)gmail.com>, 2013-2014 # trendspotter, 2019 @@ -25,8 +26,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-05 11:44+0100\n" -"PO-Revision-Date: 2021-01-05 12:15+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-02-19 20:33+0000\n" +"Last-Translator: Jan Pechacek <jan386(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -241,7 +242,7 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: {explanation}.\n" "\n" "To learn how to do a manual upgrade, go to {manual_upgrade_url}" -msgstr "" +msgstr "Měli byste provést ruční aktualizaci na {name}{version}.\n\nVíce informací o této nové verzi naleznete na {details_url}\n\nNení možné automaticky aktualizovat vaše zařízení na tuto novou verzi: {explanation}.\n\nChcete-li zjistit, jak provést ruční aktualizaci, podívejte se na {manual_upgrade_url}" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:471 msgid "New version available" @@ -302,7 +303,7 @@ msgid "" "The network connection will be disabled when applying the upgrade.\n" "\n" "Please save your work and close all other applications." -msgstr "" +msgstr "Aktualizace byla úspěšně stažena.\n\nSíťové připojení bude během provádění aktualizace vypnuto.\n\nUložte prosím svou práci a ukončete všechny ostatní aplikace." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:700 msgid "Upgrade successfully downloaded" @@ -367,7 +368,7 @@ msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the network connection is now disabled." -msgstr "" +msgstr "Vaše zařízení Tails se právě aktualizuje...\n\nZ důvodu bezpečnosti je nyní síťové připojení vypnuto." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:796 msgid "" @@ -537,7 +538,7 @@ msgstr "Zapsáno na zařízení rychlostí %(speed)d MB/s" msgid "" "There was a problem executing the following command: `%(command)s`.\n" "A more detailed error log has been written to \"%(filename)s\"." -msgstr "" +msgstr "Vyskytl se problém při provádění následujícího příkazu: `%(command)s`.\nPodrobnější záznam o chybě byl zapsán do \"%(filename)s\"." #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:424 #, python-format @@ -608,17 +609,17 @@ msgstr "Nenalezeny žádné body připojení" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:661 #, python-format msgid "Entering unmount_device for \"%(device)s\"" -msgstr "" +msgstr "Provádím unmount_device pro \"%(device)s\"" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:670 #, python-format msgid "Unmounting mounted filesystems on \"%(device)s\"" -msgstr "" +msgstr "Odpojuji připojené systémy souborů na \"%(device)s\"" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:674 #, python-format msgid "Unmounting \"%(udi)s\" on \"%(device)s\"" -msgstr "" +msgstr "Odpojuji \"%(udi)s\" na \"%(device)s\"" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:685 #, python-format @@ -788,7 +789,7 @@ msgstr "Zařízení \"%(pretty_name)s\" je moc malé pro instalaci Tails (je vy msgid "" "To upgrade device \"%(pretty_name)s\" from this Tails, you need to use a downloaded Tails ISO image:\n" "%(dl_url)s" -msgstr "" +msgstr "Pro aktualizaci zařízení \"%(pretty_name)s\" z této verze Tails budete muset použít stažený ISO obraz Tails:\n%(dl_url)s" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:513 msgid "An error happened while installing Tails" @@ -869,17 +870,17 @@ msgstr "Nastal problém při spouštění '%(cmd)s'.\n%(out)s\n%(err)s" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/source.py:64 #, python-format msgid "\"%s\" does not exist" -msgstr "" +msgstr "\"%s\" neexistuje" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/source.py:66 #, python-format msgid "\"%s\" is not a directory" -msgstr "" +msgstr "\"%s\" není adresář" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/source.py:77 #, python-format msgid "Skipping \"%(filename)s\"" -msgstr "" +msgstr "Přeskakuji \"%(filename)s\"" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/utils.py:54 #, python-format @@ -1592,7 +1593,7 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See {manual_upgrade_url}" -msgstr "" +msgstr "Není dostupný dostatek paměti pro kontrolu aktualizací.\n\nUjistěte se, že tento systém splňuje podmínky pro běh Tails.\nViz file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nZkuste restartovat Tails a znovu zkontrolovat aktualizace.\n\nNebo proveďte ruční aktualizaci.\nViz {manual_upgrade_url}" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:76 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 @@ -1617,7 +1618,7 @@ msgstr "Hostitelský operační systém i virtualizační software mohou monitor #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:40 msgid "Don't Show Again" -msgstr "" +msgstr "Příště nezobrazovat" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:42 msgid "Learn More"

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 19 Feb '21

19 Feb '21

commit df33d1e7eb2fdb145b7e7c2e3f7449ee7b4b936b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 19 20:45:21 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- cs/https-everywhere.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cs/https-everywhere.dtd b/cs/https-everywhere.dtd index c092e0ecb6..3782dcc11f 100644 --- a/cs/https-everywhere.dtd +++ b/cs/https-everywhere.dtd @@ -49,8 +49,8 @@ <!ENTITY https-everywhere.cancel.he_blocking_network "síťový degradační útok"> <!ENTITY https-everywhere.cancel.copy_url "Zkopírovat URL"> <!ENTITY https-everywhere.cancel.copied_url "Zkopírováno do schránky"> -<!ENTITY https-everywhere.cancel.open_page "Disable on this site"> -<!ENTITY https-everywhere.cancel.http_once "Proceed anyway (unsafe)"> +<!ENTITY https-everywhere.cancel.open_page "Vypnout na této stránce"> +<!ENTITY https-everywhere.cancel.http_once "Přesto pokračovat (nebezpečné)"> <!ENTITY https-everywhere.onboarding.intro "Šifrujte! Používejte automaticky zabezpečené HTTPS na mnoha stránkách."> <!ENTITY https-everywhere.onboarding.header "HTTPS Everywhere byl aktualizován!"> @@ -63,8 +63,8 @@ <!ENTITY https-everywhere.chrome.stable_rules_description "Vynutit šifrovaná spojení pro tyto stránky:"> <!ENTITY https-everywhere.chrome.experimental_rules "Experimentální pravidla"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Může způsobit upozornění nebo chyby. Zakázáno ve výchozím nastavení."> -<!ENTITY https-everywhere.chrome.disable_on_this_site "Disable on this site"> -<!ENTITY https-everywhere.chrome.enable_on_this_site "Enable on this site"> +<!ENTITY https-everywhere.chrome.disable_on_this_site "Vypnout na této stránce"> +<!ENTITY https-everywhere.chrome.enable_on_this_site "Zapnout na této stránce"> <!ENTITY https-everywhere.chrome.add_rule "Přidat pravidlo pro tuto stránku"> <!ENTITY https-everywhere.chrome.add_new_rule "Přidat nové pravidlo pro tuto stránku"> <!ENTITY https-everywhere.chrome.always_https_for_host "Pro tento server vždy používat https">

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 19 Feb '21

19 Feb '21

commit adebde9fc79b4fd839827715c8d0305c719e7772 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 19 19:16:36 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- hu.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hu.po b/hu.po index 6102e47858..bff2e4c506 100644 --- a/hu.po +++ b/hu.po @@ -9,7 +9,7 @@ # Blackywantscookies, 2014 # Blackywantscookies, 2014 # 774f2855e7016a193f9916f715f8a14e_4f42736 <c37fb76cde6546c7b7a80bc0899da2f7_124500>, 2013 -# Kovacs Zeteny <vvv.big.ed(a)protonmail.com>, 2021 +# 2bf2a1b19224666a9fd46a721e1498fd_cf6ff7b <06435adb4e599f62423b0c8619c8eba7_967332>, 2021 # Lajos Pasztor <mrlajos(a)gmail.com>, 2014 # Robert Zsolt <physx_ms(a)outlook.com>, 2016 # vargaviktor <viktor.varga(a)gmail.com>, 2013,2015,2018-2020 @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-05 11:44+0100\n" "PO-Revision-Date: 2021-02-15 22:55+0000\n" -"Last-Translator: Kovacs Zeteny <vvv.big.ed(a)protonmail.com>\n" +"Last-Translator: 2bf2a1b19224666a9fd46a721e1498fd_cf6ff7b <06435adb4e599f62423b0c8619c8eba7_967332>\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[tor-browser-build/maint-10.0-desktop] Bug 40239: Don't download mar tools from old versions
by sysrqb＠torproject.org 19 Feb '21

19 Feb '21

commit 35227374db93e0b7d1e5a1f09afd1db4289e7c00 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Feb 19 17:04:43 2021 +0100 Bug 40239: Don't download mar tools from old versions Before generating incremental mar files, we download mar files and mar-tools-linux64.zip from the previous version. However we use mar-tools from the new version and don't use the one from the old version, so there is no need to download it. --- tools/update-responses/update_responses | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index de24235..237a2be 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -565,21 +565,6 @@ sub download_version { my %sums = map { chomp; reverse split ' ', $_ } read_file "$destdir/sha256sums-signed-build.txt"; - my $martools = 'mar-tools-linux64.zip'; - exit_error "Error downloading $urldir/$martools\n" - unless getstore("$urldir/$martools", "$tmpdir/$martools") == 200; - exit_error "Error downloading $urldir/$martools.asc\n" - unless getstore("$urldir/$martools.asc", "$tmpdir/$martools.asc") == 200; - if (system('gpg', '--no-default-keyring', '--keyring', - "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', - "$tmpdir/$martools.asc", "$tmpdir/$martools")) { - exit_error "Error checking gpg signature for $version/$martools"; - } - exit_error "Wrong checksum for $version/$martools" - unless $sums{$martools} eq sha256_hex(read_file("$tmpdir/$martools")); - move "$tmpdir/$martools", "$destdir/$martools"; - move "$tmpdir/$martools.asc", "$destdir/$martools.asc"; - foreach my $file (sort grep { $_ =~ m/\.mar$/ } keys %sums) { print "Downloading $file\n"; exit_error "Error downloading $urldir/$file\n"

1 0

[tor-browser-build/master] Bug 40239: Don't download mar tools from old versions
by sysrqb＠torproject.org 19 Feb '21

19 Feb '21

commit e979fe32266998a508821669a613f6101875bd51 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Feb 19 17:04:43 2021 +0100 Bug 40239: Don't download mar tools from old versions Before generating incremental mar files, we download mar files and mar-tools-linux64.zip from the previous version. However we use mar-tools from the new version and don't use the one from the old version, so there is no need to download it. --- tools/update-responses/update_responses | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 35b971f..e897563 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -565,21 +565,6 @@ sub download_version { my %sums = map { chomp; reverse split ' ', $_ } read_file "$destdir/sha256sums-signed-build.txt"; - my $martools = 'mar-tools-linux64.zip'; - exit_error "Error downloading $urldir/$martools\n" - unless getstore("$urldir/$martools", "$tmpdir/$martools") == 200; - exit_error "Error downloading $urldir/$martools.asc\n" - unless getstore("$urldir/$martools.asc", "$tmpdir/$martools.asc") == 200; - if (system('gpg', '--no-default-keyring', '--keyring', - "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', - "$tmpdir/$martools.asc", "$tmpdir/$martools")) { - exit_error "Error checking gpg signature for $version/$martools"; - } - exit_error "Wrong checksum for $version/$martools" - unless $sums{$martools} eq sha256_hex(read_file("$tmpdir/$martools")); - move "$tmpdir/$martools", "$destdir/$martools"; - move "$tmpdir/$martools.asc", "$destdir/$martools.asc"; - foreach my $file (sort grep { $_ =~ m/\.mar$/ } keys %sums) { print "Downloading $file\n"; exit_error "Error downloading $urldir/$file\n"

1 0

[sbws/master] fix: resultdump: Log if relay was measured as exit
by juga＠torproject.org 19 Feb '21

19 Feb '21

commit beaf6de889bc75d53a6b0b90d12ab85aa0db56a0 Author: juga0 <juga(a)riseup.net> Date: Wed Feb 3 13:15:45 2021 +0000 fix: resultdump: Log if relay was measured as exit or entry. Closes #40048 --- sbws/lib/resultdump.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py index 542837e..6673e9a 100644 --- a/sbws/lib/resultdump.py +++ b/sbws/lib/resultdump.py @@ -792,6 +792,10 @@ class ResultDump: "destination {}: {}".format( result.fingerprint, result.nickname, result.circ, result.dest_url, result.msg) + # The result doesn't store the exit policies, so it can't be logged + # whether it was an exit. + as_exit = result.circ[1] == result.fingerprint + msg += ". As exit." if as_exit else ". As entry." # When the error is that there are not more functional destinations. if result.type == "error-destination": log.info("Shutting down because there are not functional "

1 0

[sbws/master] Merge branch 'maint-1.1'
by juga＠torproject.org 19 Feb '21

19 Feb '21

commit 749540147d79cec2aff487fd2a736c2e38f6d1e3 Merge: c8d1cc4 e375cd2 Author: juga0 <juga(a)riseup.net> Date: Fri Feb 19 17:51:43 2021 +0000 Merge branch 'maint-1.1' .gitignore | 1 + AUTHORS.md | 3 +- README.md | 3 +- docs/source/conf.py | 2 +- docs/source/config.rst | 4 +- docs/source/config_tor.rst | 14 ++- docs/source/how_works.rst | 3 +- .../images/20210111_consensushealth_bwauths.png | Bin 0 -> 100029 bytes docs/source/man_sbws.ini.rst | 47 ++++--- docs/source/monitoring_bandwidth.rst | 2 +- docs/source/torflow_aggr.rst | 2 +- sbws/config.default.ini | 14 ++- sbws/core/cleanup.py | 25 ---- sbws/core/generate.py | 9 +- sbws/core/scanner.py | 32 +++-- sbws/globals.py | 23 ++-- sbws/lib/circuitbuilder.py | 78 ++---------- sbws/lib/relaylist.py | 32 ++--- sbws/lib/relayprioritizer.py | 1 + sbws/lib/resultdump.py | 7 +- sbws/lib/v3bwfile.py | 12 +- sbws/util/config.py | 4 +- sbws/util/stem.py | 107 ++++++++++------ tests/integration/chutney_data/bwscanner | 15 +++ .../integration/chutney_data/client_bwscanner.tmpl | 23 ++++ tests/integration/chutney_data/non-exit.tmpl | 4 + tests/integration/chutney_data/relay-MAB.tmpl | 4 + tests/integration/chutney_data/relay-MBR.tmpl | 4 + tests/integration/conftest.py | 14 +-- tests/integration/core/test_scanner.py | 2 + tests/integration/lib/test_circuitbuilder.py | 20 +-- tests/integration/lib/test_destination.py | 6 +- tests/integration/lib/test_relaylist.py | 16 +-- tests/integration/lib/test_relayprioritizer.py | 30 ++--- tests/integration/net/auth1/fingerprint | 1 - .../net/auth1/keys/authority_certificate | 45 ------- .../net/auth1/keys/authority_identity_key | 41 ------- .../net/auth1/keys/authority_signing_key | 27 ---- .../net/auth1/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/auth1/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/auth1/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/auth1/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/auth1/keys/secret_id_key | 15 --- tests/integration/net/auth1/keys/secret_onion_key | 15 --- .../net/auth1/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/auth1/torrc | 33 ----- tests/integration/net/auth2/fingerprint | 1 - .../net/auth2/keys/authority_certificate | 45 ------- .../net/auth2/keys/authority_identity_key | 41 ------- .../net/auth2/keys/authority_signing_key | 27 ---- .../net/auth2/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/auth2/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/auth2/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/auth2/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/auth2/keys/secret_id_key | 15 --- tests/integration/net/auth2/keys/secret_onion_key | 15 --- .../net/auth2/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/auth2/torrc | 33 ----- tests/integration/net/auth3/fingerprint | 1 - .../net/auth3/keys/authority_certificate | 45 ------- .../net/auth3/keys/authority_identity_key | 41 ------- .../net/auth3/keys/authority_signing_key | 27 ---- .../net/auth3/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/auth3/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/auth3/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/auth3/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/auth3/keys/secret_id_key | 15 --- tests/integration/net/auth3/keys/secret_onion_key | 15 --- .../net/auth3/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/auth3/torrc | 33 ----- tests/integration/net/exit1/fingerprint | 1 - .../net/exit1/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/exit1/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/exit1/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/exit1/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/exit1/keys/secret_id_key | 15 --- tests/integration/net/exit1/keys/secret_onion_key | 15 --- .../net/exit1/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/exit1/torrc | 26 ---- tests/integration/net/exit2/fingerprint | 1 - .../net/exit2/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/exit2/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/exit2/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/exit2/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/exit2/keys/secret_id_key | 15 --- tests/integration/net/exit2/keys/secret_onion_key | 15 --- .../net/exit2/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/exit2/torrc | 26 ---- tests/integration/net/exit3/fingerprint | 1 - .../net/exit3/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/exit3/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/exit3/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/exit3/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/exit3/keys/secret_id_key | 15 --- tests/integration/net/exit3/keys/secret_onion_key | 15 --- .../net/exit3/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/exit3/torrc | 26 ---- tests/integration/net/relay1/fingerprint | 1 - .../net/relay1/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay1/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay1/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay1/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay1/keys/secret_id_key | 15 --- tests/integration/net/relay1/keys/secret_onion_key | 15 --- .../net/relay1/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay1/torrc | 23 ---- tests/integration/net/relay1mbyteMAB/fingerprint | 1 - .../keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay1mbyteMAB/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../relay1mbyteMAB/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes .../net/relay1mbyteMAB/keys/secret_id_key | 15 --- .../net/relay1mbyteMAB/keys/secret_onion_key | 15 --- .../net/relay1mbyteMAB/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay1mbyteMAB/torrc | 25 ---- tests/integration/net/relay1mbyteRBR/fingerprint | 1 - .../keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay1mbyteRBR/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../relay1mbyteRBR/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes .../net/relay1mbyteRBR/keys/secret_id_key | 15 --- .../net/relay1mbyteRBR/keys/secret_onion_key | 15 --- .../net/relay1mbyteRBR/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay1mbyteRBR/torrc | 25 ---- tests/integration/net/relay2/fingerprint | 1 - .../net/relay2/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay2/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay2/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay2/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay2/keys/secret_id_key | 15 --- tests/integration/net/relay2/keys/secret_onion_key | 15 --- .../net/relay2/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay2/torrc | 23 ---- tests/integration/net/relay3/fingerprint | 1 - .../net/relay3/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay3/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay3/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay3/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay3/keys/secret_id_key | 15 --- tests/integration/net/relay3/keys/secret_onion_key | 15 --- .../net/relay3/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay3/torrc | 23 ---- tests/integration/net/relay4/fingerprint | 1 - .../net/relay4/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay4/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay4/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay4/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay4/keys/secret_id_key | 15 --- tests/integration/net/relay4/keys/secret_onion_key | 15 --- .../net/relay4/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay4/torrc | 23 ---- tests/integration/net/relay5/fingerprint | 1 - .../net/relay5/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay5/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay5/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay5/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay5/keys/secret_id_key | 15 --- tests/integration/net/relay5/keys/secret_onion_key | 15 --- .../net/relay5/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay5/torrc | 23 ---- tests/integration/net/relay6/fingerprint | 1 - .../net/relay6/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay6/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay6/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay6/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay6/keys/secret_id_key | 15 --- tests/integration/net/relay6/keys/secret_onion_key | 15 --- .../net/relay6/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay6/torrc | 23 ---- tests/integration/net/relay7/fingerprint | 1 - .../net/relay7/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay7/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay7/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay7/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay7/keys/secret_id_key | 15 --- tests/integration/net/relay7/keys/secret_onion_key | 15 --- .../net/relay7/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay7/torrc | 23 ---- tests/integration/net/start.sh | 15 --- tests/integration/net/stop.sh | 4 - tests/integration/net/wait.py | 136 --------------------- tests/integration/run.sh | 14 +++ tests/integration/sbws_testnet.ini | 7 +- tests/integration/start_chutney.sh | 26 ++++ tests/integration/stop_chutney.sh | 10 ++ tests/integration/test_files.py | 7 +- tests/unit/lib/test_heartbeat.py | 2 + tests/unit/lib/test_relaylist.py | 8 +- tests/unit/lib/test_v3bwfile.py | 2 + tox.ini | 22 +--- 190 files changed, 361 insertions(+), 1647 deletions(-)

1 0

[sbws/master] chg: stem: Set default torrc options
by juga＠torproject.org 19 Feb '21

19 Feb '21

commit 5f5f968a5fc65ea334b96e6deeda934980b371e6 Author: juga0 <juga(a)riseup.net> Date: Thu Dec 17 15:09:39 2020 +0000 chg: stem: Set default torrc options when connecting to an external tor and they are not already set. --- sbws/util/stem.py | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/sbws/util/stem.py b/sbws/util/stem.py index 4e8f321..9fea31f 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -161,6 +161,16 @@ def parse_user_torrc_config(torrc, torrc_text): return torrc_dict +def set_torrc_starting_point(controller): + """Set the torrc starting point options.""" + for k, v in TORRC_STARTING_POINT.items(): + try: + controller.set_conf(k, v) + except (ControllerError, InvalidRequest, InvalidArguments) as e: + log.exception("Error setting option %s, %s: %s", k, v, e) + exit(1) + + def set_torrc_runtime_options(controller): """Set torrc options at runtime.""" try: @@ -228,16 +238,16 @@ def launch_tor(conf): def launch_or_connect_to_tor(conf): - # If connecting to an existing controller, there is no need to configure - # own tor. cont = init_controller(conf) if not cont: cont = launch_tor(conf) + else: + if not is_torrc_starting_point_set(cont): + set_torrc_starting_point(cont) # Set options that can fail at runtime set_torrc_options_can_fail(cont) # Set runtime options set_torrc_runtime_options(cont) - log.info('Started or connected to Tor %s.', cont.get_version()) return cont @@ -293,3 +303,25 @@ def circuit_str(controller, circ_id): return '[' +\ ' -> '.join(['{} ({})'.format(n, fp[0:8]) for fp, n in circ.path]) +\ ']' + + +def is_torrc_starting_point_set(tor_controller): + """Verify that the tor controller has the correct configuration. + + When connecting to a tor controller that has not been launched by sbws, + it should have been configured to work with sbws. + + """ + bad_options = False + torrc = TORRC_STARTING_POINT + for k, v in torrc.items(): + value_set = tor_controller.get_conf(k) + if v != value_set: + log.exception( + "Uncorrectly configured %s, should be %s, is %s", + k, v, value_set + ) + bad_options = True + if not bad_options: + log.info("Tor is correctly configured to work with sbws.") + return bad_options

1 0

[sbws/master] fix: test: Add chutney configuration
by juga＠torproject.org 19 Feb '21

19 Feb '21

commit 212047f4c4601d263078cde4338060704d026d78 Author: juga0 <juga(a)riseup.net> Date: Thu Dec 17 15:30:11 2020 +0000 fix: test: Add chutney configuration and scripts to run the integration tests with chutney. It does not replace yet the way integration tests are run. --- .gitignore | 1 + tests/integration/chutney_data/bwscanner | 15 +++++++++++++ .../integration/chutney_data/client_bwscanner.tmpl | 23 +++++++++++++++++++ tests/integration/chutney_data/non-exit.tmpl | 4 ++++ tests/integration/chutney_data/relay-MAB.tmpl | 4 ++++ tests/integration/chutney_data/relay-MBR.tmpl | 4 ++++ tests/integration/run.sh | 14 ++++++++++++ tests/integration/start_chutney.sh | 26 ++++++++++++++++++++++ tests/integration/stop_chutney.sh | 10 +++++++++ 9 files changed, 101 insertions(+) diff --git a/.gitignore b/.gitignore index 9903d5d..744436b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ htmlcov dist build *.lockfile +chutney diff --git a/tests/integration/chutney_data/bwscanner b/tests/integration/chutney_data/bwscanner new file mode 100644 index 0000000..6506bc3 --- /dev/null +++ b/tests/integration/chutney_data/bwscanner @@ -0,0 +1,15 @@ +# By default, Authorities are not configured as exits +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +NonExitRelay = Node(tag="m", relay=1, exit=0, torrc="non-exit.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") +Client = Node(tag="c", client=1, torrc="client_bwscanner.tmpl") +RelayMAB = Node(tag="relay1mbyteMAB", relay=1, torrc="relay-MAB.tmpl") +RelayMBR = Node(tag="relay1mbyteMBR", relay=1, torrc="relay-MBR.tmpl") + +NODES = Authority.getN(3) + \ + NonExitRelay.getN(9) + \ + ExitRelay.getN(3) + Client.getN(1) + +# RelayMBR.getN(1) + RelayMAB.getN(1) + \ + +ConfigureNodes(NODES) diff --git a/tests/integration/chutney_data/client_bwscanner.tmpl b/tests/integration/chutney_data/client_bwscanner.tmpl new file mode 100644 index 0000000..dc6d0d8 --- /dev/null +++ b/tests/integration/chutney_data/client_bwscanner.tmpl @@ -0,0 +1,23 @@ +${include:common.i} +SocksPort $socksport + +#NOTE: Setting TestingClientConsensusDownloadSchedule doesn't +# help -- dl_stats.schedule is not DL_SCHED_CONSENSUS +# at boostrap time. +# Try to download after: +# the minimum initial consensus time to start with, +# a few eager fetches, +# then half the minimum testing consensus interval +#TestingClientDownloadSchedule 0, 5 +#TestingClientConsensusDownloadSchedule 0, 5 +#ControlPort 8015 +UseEntryGuards 0 +UseMicroDescriptors 0 +FetchDirInfoEarly 1 +FetchDirInfoExtraEarly 1 +FetchUselessDescriptors 1 +LearnCircuitBuildTimeout 0 +CircuitBuildTimeout 60 +ConnectionPadding 0 +__DisablePredictedCircuits 1 +__LeaveStreamsUnattached 1 diff --git a/tests/integration/chutney_data/non-exit.tmpl b/tests/integration/chutney_data/non-exit.tmpl new file mode 100644 index 0000000..25d8806 --- /dev/null +++ b/tests/integration/chutney_data/non-exit.tmpl @@ -0,0 +1,4 @@ +${include:relay-non-exit.tmpl} + +ExitRelay 0 +ExitPolicy reject *:* diff --git a/tests/integration/chutney_data/relay-MAB.tmpl b/tests/integration/chutney_data/relay-MAB.tmpl new file mode 100644 index 0000000..28bc6a7 --- /dev/null +++ b/tests/integration/chutney_data/relay-MAB.tmpl @@ -0,0 +1,4 @@ +${include:non-exit.tmpl} + +Nickname relay1mbyteMAB +MaxAdvertisedBandwidth 1 MBytes diff --git a/tests/integration/chutney_data/relay-MBR.tmpl b/tests/integration/chutney_data/relay-MBR.tmpl new file mode 100644 index 0000000..946600b --- /dev/null +++ b/tests/integration/chutney_data/relay-MBR.tmpl @@ -0,0 +1,4 @@ +${include:non-exit.tmpl} + +Nickname relay1mbyteMBR +RelayBandwidthRate 1 MBytes diff --git a/tests/integration/run.sh b/tests/integration/run.sh new file mode 100755 index 0000000..e870b50 --- /dev/null +++ b/tests/integration/run.sh @@ -0,0 +1,14 @@ +#!/bin/bash +set -x + +tests/integration/start_chutney.sh +python3 scripts/tools/sbws-http-server.py --port 28888 &>/dev/null & +sleep 1 +wget -O/dev/null http://127.0.0.1:28888/sbws.bin +# Run actually the scanner +sbws -c tests/integration/sbws_testnet.ini scanner +sbws -c tests/integration/sbws_testnet.ini generate +# Run integration tests +coverage run -a --rcfile=.coveragerc --source=sbws -m pytest -s tests/integration -vv +sbws -c tests/integration/sbws_testnet.ini cleanup +tests/integration/stop_chutney.sh diff --git a/tests/integration/start_chutney.sh b/tests/integration/start_chutney.sh new file mode 100755 index 0000000..04f9641 --- /dev/null +++ b/tests/integration/start_chutney.sh @@ -0,0 +1,26 @@ +#!/bin/bash +set -x + +CURRENT_DIR=`pwd` +CHUTNEY_DIR=${1:-./chutney} + +# If chutney dir already exists, this will fail but it doesn't matter. +git clone https://git.torproject.org/chutney.git $CHUTNEY_DIR + +cp tests/integration/chutney_data/bwscanner $CHUTNEY_DIR/networks +cp tests/integration/chutney_data/*.tmpl $CHUTNEY_DIR/torrc_templates + +cd $CHUTNEY_DIR +# In case it wasn't cloned recently, pull. +# Since this is run only for the tests, it's ok if the tests fail with a newer +# chutney version, so that we can detect it early. +git pull + +# Stop chutney network if it is already running +./chutney stop networks/bwscanner +./chutney configure networks/bwscanner +./chutney start networks/bwscanner +./chutney status networks/bwscanner +./chutney wait_for_bootstrap networks/bwscanner + +cd $CURRENT_DIR diff --git a/tests/integration/stop_chutney.sh b/tests/integration/stop_chutney.sh new file mode 100755 index 0000000..6008453 --- /dev/null +++ b/tests/integration/stop_chutney.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +set -x + +CURRENT_DIR=`pwd` +CHUTNEY_DIR=${1:-./chutney} +cd $CHUTNEY_DIR +# Stop chutney network if it is already running +./chutney stop networks/bwscanner +cd $CURRENT_DIR

1 0