commit 749540147d79cec2aff487fd2a736c2e38f6d1e3 Merge: c8d1cc4 e375cd2 Author: juga0 juga@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(-)