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

[tor/master] Merge branch 'maint-0.4.4'
by nickm＠torproject.org 15 Jun '20

15 Jun '20

commit 7e600a74bc5266cb5969536f230b87b41e80cef2 Merge: 9fdaede3f 85c0ba1cf Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 15 16:43:18 2020 -0400 Merge branch 'maint-0.4.4' ChangeLog | 39 ++++ ReleaseNotes | 614 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 653 insertions(+)

1 0

[tor/release-0.4.4] forward-port changelog and release-notes from 0.4.3.5
by nickm＠torproject.org 15 Jun '20

15 Jun '20

commit 85c0ba1cfb08adb08d674a549d4cfbe7ee050b31 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 15 16:43:09 2020 -0400 forward-port changelog and release-notes from 0.4.3.5 --- ChangeLog | 39 ++++ ReleaseNotes | 614 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 653 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1efcbcf00..9ddbfa95f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,42 @@ +Changes in version 0.4.3.5 - 2020-05-15 + Tor 0.4.3.5 is the first stable release in the 0.4.3.x series. This + series adds support for building without relay code enabled, and + implements functionality needed for OnionBalance with v3 onion + services. It includes significant refactoring of our configuration and + controller functionality, and fixes numerous smaller bugs and + performance issues. + + Per our support policy, we support each stable release series for nine + months after its first stable release, or three months after the first + stable release of the next series: whichever is longer. This means + that 0.4.3.x will be supported until around February 2021--later, if + 0.4.4.x is later than anticipated. + + Note also that support for 0.4.1.x is about to end on May 20 of this + year; 0.4.2.x will be supported until September 15. We still plan to + continue supporting 0.3.5.x, our long-term stable series, until + Feb 2022. + + Below are the changes since 0.4.3.4-rc. For a complete list of changes + since 0.4.2.6, see the ReleaseNotes file. + + o Minor bugfixes (compiler compatibility): + - Avoid compiler warnings from Clang 10 related to the use of GCC- + style "/* falls through */" comments. Both Clang and GCC allow + __attribute__((fallthrough)) instead, so that's what we're using + now. Fixes bug 34078; bugfix on 0.3.1.3-alpha. + - Fix compilation warnings with GCC 10.0.1. Fixes bug 34077; bugfix + on 0.4.0.3-alpha. + + o Minor bugfixes (logging): + - Stop truncating IPv6 addresses and ports in channel and connection + logs. Fixes bug 33918; bugfix on 0.2.4.4-alpha. + - Fix a logic error in a log message about whether an address was + invalid. Previously, the code would never report that onion + addresses were onion addresses. Fixes bug 34131; bugfix + on 0.4.3.1-alpha. + + Changes in version 0.4.3.4-rc - 2020-04-13 Tor 0.4.3.4-rc is the first release candidate in its series. It fixes several bugs from earlier versions, including one affecting DoS diff --git a/ReleaseNotes b/ReleaseNotes index a241da302..a572293c0 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3,6 +3,620 @@ release of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. +Changes in version 0.4.3.5 - 2020-05-15 + Tor 0.4.3.5 is the first stable release in the 0.4.3.x series. This + series adds support for building without relay code enabled, and + implements functionality needed for OnionBalance with v3 onion + services. It includes significant refactoring of our configuration and + controller functionality, and fixes numerous smaller bugs and + performance issues. + + Per our support policy, we support each stable release series for nine + months after its first stable release, or three months after the first + stable release of the next series: whichever is longer. This means + that 0.4.3.x will be supported until around February 2021--later, if + 0.4.4.x is later than anticipated. + + Note also that support for 0.4.1.x is about to end on May 20 of this + year; 0.4.2.x will be supported until September 15. We still plan to + continue supporting 0.3.5.x, our long-term stable series, until + Feb 2022. + + Below are the changes since 0.4.2.6. For a list of only the changes + since 0.4.3.4-rc, see the ChangeLog file. + + o New system requirements: + - When building Tor, you now need to have Python 3 in order to run + the integration tests. (Python 2 is officially unsupported + upstream, as of 1 Jan 2020.) Closes ticket 32608. + + o Major features (build system): + - The relay code can now be disabled using the --disable-module-relay + configure option. When this option is set, we also disable the + dirauth module. Closes ticket 32123. + - When Tor is compiled --disable-module-relay, we also omit the code + used to act as a directory cache. Closes ticket 32487. + + o Major features (directory authority, ed25519): + - Add support for banning a relay's ed25519 keys in the approved- + routers file. This will help us migrate away from RSA keys in the + future. Previously, only RSA keys could be banned in approved- + routers. Resolves ticket 22029. Patch by Neel Chauhan. + + o Major features (onion services): + - New control port commands to manage client-side onion service + authorization credentials. The ONION_CLIENT_AUTH_ADD command adds + a credential, ONION_CLIENT_AUTH_REMOVE deletes a credential, and + ONION_CLIENT_AUTH_VIEW lists the credentials. Closes ticket 30381. + - Introduce a new SocksPort flag, ExtendedErrors, to support more + detailed error codes in information for applications that support + them. Closes ticket 30382; implements proposal 304. + + o Major features (proxy): + - In addition to its current supported proxy types (HTTP CONNECT, + SOCKS4, and SOCKS5), Tor can now make its OR connections through a + HAProxy server. A new torrc option was added to specify the + address/port of the server: TCPProxy <protocol> <host>:<port>. + Currently the only supported protocol for the option is haproxy. + Closes ticket 31518. Patch done by Suphanat Chunhapanya (haxxpop). + + o Major bugfixes (security, denial-of-service): + - Fix a denial-of-service bug that could be used by anyone to + consume a bunch of CPU on any Tor relay or authority, or by + directories to consume a bunch of CPU on clients or hidden + services. Because of the potential for CPU consumption to + introduce observable timing patterns, we are treating this as a + high-severity security issue. Fixes bug 33119; bugfix on + 0.2.1.5-alpha. Found by OSS-Fuzz. We are also tracking this issue + as TROVE-2020-002 and CVE-2020-10592. + + o Major bugfixes (circuit padding, memory leak): + - Avoid a remotely triggered memory leak in the case that a circuit + padding machine is somehow negotiated twice on the same circuit. + Fixes bug 33619; bugfix on 0.4.0.1-alpha. Found by Tobias Pulls. + This is also tracked as TROVE-2020-004 and CVE-2020-10593. + + o Major bugfixes (directory authority): + - Directory authorities will now send a 503 (not enough bandwidth) + code to clients when under bandwidth pressure. Known relays and + other authorities will always be answered regardless of the + bandwidth situation. Fixes bug 33029; bugfix on 0.1.2.5-alpha. + + o Major bugfixes (DoS defenses, bridges, pluggable transport): + - Fix a bug that was preventing DoS defenses from running on bridges + with a pluggable transport. Previously, the DoS subsystem was not + given the transport name of the client connection, thus failed to + find the GeoIP cache entry for that client address. Fixes bug + 33491; bugfix on 0.3.3.2-alpha. + + o Major bugfixes (networking): + - Correctly handle IPv6 addresses in SOCKS5 RESOLVE_PTR requests, + and accept strings as well as binary addresses. Fixes bug 32315; + bugfix on 0.3.5.1-alpha. + + o Major bugfixes (onion service): + - Report HS circuit failure back into the HS subsystem so we take + appropriate action with regards to the client introduction point + failure cache. This improves reachability of onion services, since + now clients notice failing introduction circuits properly. Fixes + bug 32020; bugfix on 0.3.2.1-alpha. + + o Minor feature (heartbeat, onion service): + - Add the DoS INTRODUCE2 defenses counter to the heartbeat DoS + message. Closes ticket 31371. + + o Minor feature (sendme, flow control): + - Default to sending SENDME version 1 cells. (Clients are already + sending these, because of a consensus parameter telling them to do + so: this change only affects what clients would do if the + consensus didn't contain a recommendation.) Closes ticket 33623. + + o Minor features (best practices tracker): + - Practracker now supports a --regen-overbroad option to regenerate + the exceptions file, but only to revise exceptions to be _less_ + tolerant of best-practices violations. Closes ticket 32372. + + o Minor features (configuration validation): + - Configuration validation can now be done by per-module callbacks, + rather than a global validation function. This will let us reduce + the size of config.c and some of its more cumbersome functions. + Closes ticket 31241. + + o Minor features (configuration): + - If a configured hardware crypto accelerator in AccelName is + prefixed with "!", Tor now exits when it cannot be found. Closes + ticket 32406. + - We now use flag-driven logic to warn about obsolete configuration + fields, so that we can include their names. In 0.4.2, we used a + special type, which prevented us from generating good warnings. + Implements ticket 32404. + + o Minor features (configure, build system): + - Output a list of enabled/disabled features at the end of the + configure process in a pleasing way. Closes ticket 31373. + + o Minor features (continuous integration): + - Run Doxygen Makefile target on Travis, so we can learn about + regressions in our internal documentation. Closes ticket 32455. + - Stop allowing failures on the Travis CI stem tests job. It looks + like all the stem hangs we were seeing before are now fixed. + Closes ticket 33075. + + o Minor features (controller): + - Add stream isolation data to STREAM event. Closes ticket 19859. + - Implement a new GETINFO command to fetch microdescriptor + consensus. Closes ticket 31684. + + o Minor features (debugging, directory system): + - Don't crash when we find a non-guard with a guard-fraction value + set. Instead, log a bug warning, in an attempt to figure out how + this happened. Diagnostic for ticket 32868. + + o Minor features (defense in depth): + - Add additional checks around tor_vasprintf() usage, in case the + function returns an error. Patch by Tobias Stoeckmann. Fixes + ticket 31147. + + o Minor features (developer tools): + - Remove the 0.2.9.x series branches from git scripts (git-merge- + forward.sh, git-pull-all.sh, git-push-all.sh, git-setup-dirs.sh). + Closes ticket 32772. + - Add a check_cocci_parse.sh script that checks that new code is + parseable by Coccinelle. Add an exceptions file for unparseable + files, and run the script from travis CI. Closes ticket 31919. + - Call the check_cocci_parse.sh script from a 'check-cocci' Makefile + target. Closes ticket 31919. + - Add a rename_c_identifiers.py tool to rename a bunch of C + identifiers at once, and generate a well-formed commit message + describing the change. This should help with refactoring. Closes + ticket 32237. + - Add some scripts in "scripts/coccinelle" to invoke the Coccinelle + semantic patching tool with the correct flags. These flags are + fairly easy to forget, and these scripts should help us use + Coccinelle more effectively in the future. Closes ticket 31705. + + o Minor features (diagnostic): + - Improve assertions and add some memory-poisoning code to try to + track down possible causes of a rare crash (32564) in the EWMA + code. Closes ticket 33290. + + o Minor features (directory authorities): + - Directory authorities now reject descriptors from relays running + Tor versions from the 0.2.9 and 0.4.0 series. The 0.3.5 series is + still allowed. Resolves ticket 32672. Patch by Neel Chauhan. + + o Minor features (Doxygen): + - Update Doxygen configuration file to a more recent template (from + 1.8.15). Closes ticket 32110. + - "make doxygen" now works with out-of-tree builds. Closes + ticket 32113. + - Make sure that doxygen outputs documentation for all of our C + files. Previously, some were missing @file declarations, causing + them to be ignored. Closes ticket 32307. + - Our "make doxygen" target now respects --enable-fatal-warnings by + default, and does not warn about items that are missing + documentation. To warn about missing documentation, run configure + with the "--enable-missing-doc-warnings" flag: doing so suspends + fatal warnings for doxygen. Closes ticket 32385. + + o Minor features (git scripts): + - Add TOR_EXTRA_CLONE_ARGS to git-setup-dirs.sh for git clone + customisation. Closes ticket 32347. + - Add git-setup-dirs.sh, which sets up an upstream git repository + and worktrees for tor maintainers. Closes ticket 29603. + - Add TOR_EXTRA_REMOTE_* to git-setup-dirs.sh for a custom extra + remote. Closes ticket 32347. + - Call the check_cocci_parse.sh script from the git commit and push + hooks. Closes ticket 31919. + - Make git-push-all.sh skip unchanged branches when pushing to + upstream. The script already skipped unchanged test branches. + Closes ticket 32216. + - Make git-setup-dirs.sh create a master symlink in the worktree + directory. Closes ticket 32347. + - Skip unmodified source files when doing some existing git hook + checks. Related to ticket 31919. + + o Minor features (IPv6, client): + - Make Tor clients tell dual-stack exits that they prefer IPv6 + connections. This change is equivalent to setting the PreferIPv6 + flag on SOCKSPorts (and most other listener ports). Tor Browser + has been setting this flag for some time, and we want to remove a + client distinguisher at exits. Closes ticket 32637. + + o Minor features (portability, android): + - When building for Android, disable some tests that depend on $HOME + and/or pwdb, which Android doesn't have. Closes ticket 32825. + Patch from Hans-Christoph Steiner. + + o Minor features (relay modularity): + - Split the relay and server pluggable transport config code into + separate files in the relay module. Disable this code when the + relay module is disabled. Closes part of ticket 32213. + - When the relay module is disabled, reject attempts to set the + ORPort, DirPort, DirCache, BridgeRelay, ExtORPort, or + ServerTransport* options, rather than ignoring the values of these + options. Closes part of ticket 32213. + - When the relay module is disabled, change the default config so + that DirCache is 0, and ClientOnly is 1. Closes ticket 32410. + + o Minor features (release tools): + - Port our ChangeLog formatting and sorting tools to Python 3. + Closes ticket 32704. + + o Minor features (testing): + - The unit tests now support a "TOR_SKIP_TESTCASES" environment + variable to specify a list of space-separated test cases that + should not be executed. We will use this to disable certain tests + that are failing on Appveyor because of mismatched OpenSSL + libraries. Part of ticket 33643. + - Detect some common failure cases for test_parseconf.sh in + src/test/conf_failures. Closes ticket 32451. + - Allow test_parseconf.sh to test expected log outputs for successful + configs, as well as failed configs. Closes ticket 32451. + - The test_parseconf.sh script now supports result variants for any + combination of the optional libraries lzma, nss, and zstd. Closes + ticket 32397. + - When running the unit tests on Android, create temporary files in + a subdirectory of /data/local/tmp. Closes ticket 32172. Based on a + patch from Hans-Christoph Steiner. + + o Minor features (usability): + - Include more information when failing to parse a configuration + value. This should make it easier to tell what's going wrong when + a configuration file doesn't parse. Closes ticket 33460. + + o Minor bugfix (relay, configuration): + - Warn if the ContactInfo field is not set, and tell the relay + operator that not having a ContactInfo field set might cause their + relay to get rejected in the future. Fixes bug 33361; bugfix + on 0.1.1.10-alpha. + + o Minor bugfixes (bridges): + - Lowercase the configured value of BridgeDistribution before adding + it to the descriptor. Fixes bug 32753; bugfix on 0.3.2.3-alpha. + + o Minor bugfixes (build system): + - Fix "make autostyle" for out-of-tree builds. Fixes bug 32370; + bugfix on 0.4.1.2-alpha. + + o Minor bugfixes (compiler compatibility): + - Avoid compiler warnings from Clang 10 related to the use of GCC- + style "/* falls through */" comments. Both Clang and GCC allow + __attribute__((fallthrough)) instead, so that's what we're using + now. Fixes bug 34078; bugfix on 0.3.1.3-alpha. + - Fix compilation warnings with GCC 10.0.1. Fixes bug 34077; bugfix + on 0.4.0.3-alpha. + + o Minor bugfixes (configuration handling): + - Make control_event_conf_changed() take in a config_line_t instead + of a smartlist of alternating key/value entries. Fixes bug 31531; + bugfix on 0.2.3.3-alpha. Patch by Neel Chauhan. + - Check for multiplication overflow when parsing memory units inside + configuration. Fixes bug 30920; bugfix on 0.0.9rc1. + - When dumping the configuration, stop adding a trailing space after + the option name when there is no option value. This issue only + affects options that accept an empty value or list. (Most options + reject empty values, or delete the entire line from the dumped + options.) Fixes bug 32352; bugfix on 0.0.9pre6. + - Avoid changing the user's value of HardwareAccel as stored by + SAVECONF, when AccelName is set but HardwareAccel is not. Fixes + bug 32382; bugfix on 0.2.2.1-alpha. + - When creating a KeyDirectory with the same location as the + DataDirectory (not recommended), respect the DataDirectory's + group-readable setting if one has not been set for the + KeyDirectory. Fixes bug 27992; bugfix on 0.3.3.1-alpha. + + o Minor bugfixes (continuous integration): + - Remove the buggy and unused mirroring job. Fixes bug 33213; bugfix + on 0.3.2.2-alpha. + + o Minor bugfixes (controller protocol): + - When receiving "ACTIVE" or "DORMANT" signals on the control port, + report them as SIGNAL events. Previously we would log a bug + warning. Fixes bug 33104; bugfix on 0.4.0.1-alpha. + + o Minor bugfixes (controller): + - In routerstatus_has_changed(), check all the fields that are + output over the control port. Fixes bug 20218; bugfix + on 0.1.1.11-alpha. + + o Minor bugfixes (developer tools): + - Allow paths starting with ./ in scripts/add_c_file.py. Fixes bug + 31336; bugfix on 0.4.1.2-alpha. + + o Minor bugfixes (dirauth module): + - Split the dirauth config code into a separate file in the dirauth + module. Disable this code when the dirauth module is disabled. + Closes ticket 32213. + - When the dirauth module is disabled, reject attempts to set the + AuthoritativeDir option, rather than ignoring the value of the + option. Fixes bug 32213; bugfix on 0.3.4.1-alpha. + + o Minor bugfixes (embedded Tor): + - When starting Tor any time after the first time in a process, + register the thread in which it is running as the main thread. + Previously, we only did this on Windows, which could lead to bugs + like 23081 on non-Windows platforms. Fixes bug 32884; bugfix + on 0.3.3.1-alpha. + + o Minor bugfixes (git scripts): + - Avoid sleeping before the last push in git-push-all.sh. Closes + ticket 32216. + - Forward all unrecognised arguments in git-push-all.sh to git push. + Closes ticket 32216. + + o Minor bugfixes (key portability): + - When reading PEM-encoded key data, tolerate CRLF line-endings even + if we are not running on Windows. Previously, non-Windows hosts + would reject these line-endings in certain positions, making + certain key files hard to move from one host to another. Fixes bug + 33032; bugfix on 0.3.5.1-alpha. + + o Minor bugfixes (logging): + - Stop truncating IPv6 addresses and ports in channel and connection + logs. Fixes bug 33918; bugfix on 0.2.4.4-alpha. + - Flush stderr, stdout, and file logs during shutdown, if supported + by the OS. This change helps make sure that any final logs are + recorded. Fixes bug 33087; bugfix on 0.4.1.6. + - Stop closing stderr and stdout during shutdown. Closing these file + descriptors can hide sanitiser logs. Fixes bug 33087; bugfix + on 0.4.1.6. + - If we encounter a bug when flushing a buffer to a TLS connection, + only log the bug once per invocation of the Tor process. + Previously we would log with every occurrence, which could cause + us to run out of disk space. Fixes bug 33093; bugfix + on 0.3.2.2-alpha. + - When logging a bug, do not say "Future instances of this warning + will be silenced" unless we are actually going to silence them. + Previously we would say this whenever a BUG() check failed in the + code. Fixes bug 33095; bugfix on 0.4.1.1-alpha. + + o Minor bugfixes (onion services v2): + - Move a series of v2 onion service warnings to protocol-warning + level because they can all be triggered remotely by a malformed + request. Fixes bug 32706; bugfix on 0.1.1.14-alpha. + - When sending the INTRO cell for a v2 Onion Service, look at the + failure cache alongside timeout values to check if the intro point + is marked as failed. Previously, we only looked at the relay + timeout values. Fixes bug 25568; bugfix on 0.2.7.3-rc. Patch by + Neel Chauhan. + + o Minor bugfixes (onion services v3): + - Remove a BUG() warning that would cause a stack trace if an onion + service descriptor was freed while we were waiting for a + rendezvous circuit to complete. Fixes bug 28992; bugfix + on 0.3.2.1-alpha. + - Relax severity of a log message that can appear naturally when + decoding onion service descriptors as a relay. Also add some + diagnostics to debug any future bugs in that area. Fixes bug + 31669; bugfix on 0.3.0.1-alpha. + - Fix an assertion failure that could result from a corrupted + ADD_ONION control port command. Found by Saibato. Fixes bug 33137; + bugfix on 0.3.3.1-alpha. This issue is also tracked + as TROVE-2020-003. + - Properly handle the client rendezvous circuit timeout. Previously + Tor would sometimes timeout a rendezvous circuit awaiting the + introduction ACK, and find itself unable to re-establish all + circuits because the rendezvous circuit timed out too early. Fixes + bug 32021; bugfix on 0.3.2.1-alpha. + + o Minor bugfixes (onion services): + - Do not rely on a "circuit established" flag for intro circuits but + instead always query the HS circuit map. This is to avoid sync + issue with that flag and the map. Fixes bug 32094; bugfix + on 0.3.2.1-alpha. + + o Minor bugfixes (onion services, all): + - In cancel_descriptor_fetches(), use + connection_list_by_type_purpose() instead of + connection_list_by_type_state(). Fixes bug 32639; bugfix on + 0.3.2.1-alpha. Patch by Neel Chauhan. + + o Minor bugfixes (pluggable transports): + - When receiving a message on standard error from a pluggable + transport, log it at info level, rather than as a warning. Fixes + bug 33005; bugfix on 0.4.0.1-alpha. + + o Minor bugfixes (rust, build): + - Fix a syntax warning given by newer versions of Rust that was + creating problems for our continuous integration. Fixes bug 33212; + bugfix on 0.3.5.1-alpha. + + o Minor bugfixes (scripts): + - Fix update_versions.py for out-of-tree builds. Fixes bug 32371; + bugfix on 0.4.0.1-alpha. + + o Minor bugfixes (testing): + - Use the same code to find the tor binary in all of our test + scripts. This change makes sure we are always using the coverage + binary when coverage is enabled. Fixes bug 32368; bugfix + on 0.2.7.3-rc. + - Stop ignoring "tor --dump-config" errors in test_parseconf.sh. + Fixes bug 32468; bugfix on 0.4.2.1-alpha. + - Our option-validation tests no longer depend on specially + configured non-default, non-passing sets of options. Previously, + the tests had been written to assume that options would _not_ be + set to their defaults, which led to needless complexity and + verbosity. Fixes bug 32175; bugfix on 0.2.8.1-alpha. + + o Minor bugfixes (TLS bug handling): + - When encountering a bug in buf_read_from_tls(), return a "MISC" + error code rather than "WANTWRITE". This change might help avoid + some CPU-wasting loops if the bug is ever triggered. Bug reported + by opara. Fixes bug 32673; bugfix on 0.3.0.4-alpha. + + o Deprecated features: + - Deprecate the ClientAutoIPv6ORPort option. This option was not + true "Happy Eyeballs", and often failed on connections that + weren't reliably dual-stack. Closes ticket 32942. Patch by + Neel Chauhan. + + o Documentation: + - Provide a quickstart guide for a Circuit Padding Framework, and + documentation for researchers to implement and study circuit + padding machines. Closes ticket 28804. + - Add documentation in 'HelpfulTools.md' to describe how to build a + tag file. Closes ticket 32779. + - Create a high-level description of the long-term software + architecture goals. Closes ticket 32206. + - Describe the --dump-config command in the manual page. Closes + ticket 32467. + - Unite coding advice from this_not_that.md in torguts repo into our + coding standards document. Resolves ticket 31853. + + o Removed features: + - Our Doxygen configuration no longer generates LaTeX output. The + reference manual produced by doing this was over 4000 pages long, + and generally unusable. Closes ticket 32099. + - The option "TestingEstimatedDescriptorPropagationTime" is now + marked as obsolete. It has had no effect since 0.3.0.7, when + clients stopped rejecting consensuses "from the future". Closes + ticket 32807. + - We no longer support consensus methods before method 28; these + methods were only used by authorities running versions of Tor that + are now at end-of-life. In effect, this means that clients, + relays, and authorities now assume that authorities will be + running version 0.3.5.x or later. Closes ticket 32695. + + o Testing: + - Avoid conflicts between the fake sockets in tor's unit tests, and + real file descriptors. Resolves issues running unit tests with + GitHub Actions, where the process that embeds or launches the + tests has already opened a large number of file descriptors. Fixes + bug 33782; bugfix on 0.2.8.1-alpha. Found and fixed by + Putta Khunchalee. + - Add more test cases for tor's UTF-8 validation function. Also, + check the arguments passed to the function for consistency. Closes + ticket 32845. + - Improve test coverage for relay and dirauth config code, focusing + on option validation and normalization. Closes ticket 32213. + - Improve the consistency of test_parseconf.sh output, and run all + the tests, even if one fails. Closes ticket 32213. + - Run the practracker unit tests in the pre-commit git hook. Closes + ticket 32609. + + o Code simplification and refactoring (channel): + - Channel layer had a variable length cell handler that was not used + and thus removed. Closes ticket 32892. + + o Code simplification and refactoring (configuration): + - Immutability is now implemented as a flag on individual + configuration options rather than as part of the option-transition + checking code. Closes ticket 32344. + - Instead of keeping a list of configuration options to check for + relative paths, check all the options whose type is "FILENAME". + Solves part of ticket 32339. + - Our default log (which ordinarily sends NOTICE-level messages to + standard output) is now handled in a more logical manner. + Previously, we replaced the configured log options if they were + empty. Now, we interpret an empty set of log options as meaning + "use the default log". Closes ticket 31999. + - Remove some unused arguments from the options_validate() function, + to simplify our code and tests. Closes ticket 32187. + - Simplify the options_validate() code so that it looks at the + default options directly, rather than taking default options as an + argument. This change lets us simplify its interface. Closes + ticket 32185. + - Use our new configuration architecture to move most authority- + related options to the directory authority module. Closes + ticket 32806. + - When parsing the command line, handle options that determine our + "quiet level" and our mode of operation (e.g., --dump-config and + so on) all in one table. Closes ticket 32003. + + o Code simplification and refactoring (controller): + - Create a new abstraction for formatting control protocol reply + lines based on key-value pairs. Refactor some existing control + protocol code to take advantage of this. Closes ticket 30984. + - Create a helper function that can fetch network status or + microdesc consensuses. Closes ticket 31684. + + o Code simplification and refactoring (dirauth modularization): + - Remove the last remaining HAVE_MODULE_DIRAUTH inside a function. + Closes ticket 32163. + - Replace some confusing identifiers in process_descs.c. Closes + ticket 29826. + - Simplify some relay and dirauth config code. Closes ticket 32213. + + o Code simplification and refactoring (mainloop): + - Simplify the ip_address_changed() function by removing redundant + checks. Closes ticket 33091. + + o Code simplification and refactoring (misc): + - Make all the structs we declare follow the same naming convention + of ending with "_t". Closes ticket 32415. + - Move and rename some configuration-related code for clarity. + Closes ticket 32304. + - Our include.am files are now broken up by subdirectory. + Previously, src/core/include.am covered all of the subdirectories + in "core", "feature", and "app". Closes ticket 32137. + - Remove underused NS*() macros from test code: they make our tests + more confusing, especially for code-formatting tools. Closes + ticket 32887. + + o Code simplification and refactoring (relay modularization): + - Disable relay_periodic when the relay module is disabled. Closes + ticket 32244. + - Disable relay_sys when the relay module is disabled. Closes + ticket 32245. + + o Code simplification and refactoring (tool support): + - Add numerous missing dependencies to our include files, so that + they can be included in different reasonable orders and still + compile. Addresses part of ticket 32764. + - Fix some parts of our code that were difficult for Coccinelle to + parse. Related to ticket 31705. + - Fix some small issues in our code that prevented automatic + formatting tools from working. Addresses part of ticket 32764. + + o Documentation (manpage): + - Alphabetize the Server and Directory server sections of the tor + manpage. Also split Statistics options into their own section of + the manpage. Closes ticket 33188. Work by Swati Thacker as part of + Google Season of Docs. + - Document the __OwningControllerProcess torrc option and specify + its polling interval. Resolves issue 32971. + - Split "Circuit Timeout" options and "Node Selection" options into + their own sections of the tor manpage. Closes tickets 32928 and + 32929. Work by Swati Thacker as part of Google Season of Docs. + - Alphabetize the Client Options section of the tor manpage. Closes + ticket 32846. + - Alphabetize the General Options section of the tor manpage. Closes + ticket 32708. + - In the tor(1) manpage, reword and improve formatting of the + COMMAND-LINE OPTIONS and DESCRIPTION sections. Closes ticket + 32277. Based on work by Swati Thacker as part of Google Season + of Docs. + - In the tor(1) manpage, reword and improve formatting of the FILES, + SEE ALSO, and BUGS sections. Closes ticket 32176. Based on work by + Swati Thacker as part of Google Season of Docs. + + o Testing (Appveyor CI): + - In our Appveyor Windows CI, copy required DLLs to test and app + directories, before running tor's tests. This ensures that tor.exe + and test*.exe use the correct version of each DLL. This fix is not + required, but we hope it will avoid DLL search issues in future. + Fixes bug 33673; bugfix on 0.3.4.2-alpha. + - On Appveyor, skip the crypto/openssl_version test, which is + failing because of a mismatched library installation. Fix + for 33643. + + o Testing (circuit, EWMA): + - Add unit tests for circuitmux and EWMA subsystems. Closes + ticket 32196. + + o Testing (Travis CI): + - Remove a redundant distcheck job. Closes ticket 33194. + - Sort the Travis jobs in order of speed: putting the slowest jobs + first takes full advantage of Travis job concurrency. Closes + ticket 33194. + - Stop allowing the Chutney IPv6 Travis job to fail. This job was + previously configured to fast_finish (which requires + allow_failure), to speed up the build. Closes ticket 33195. + - When a Travis chutney job fails, use chutney's new "diagnostics.sh" + tool to produce detailed diagnostic output. Closes ticket 32792. + + Changes in version 0.4.2.7 - 2020-03-18 This is the third stable release in the 0.4.2.x series. It backports numerous fixes from later releases, including a fix for TROVE-2020-

1 0

[tor/maint-0.4.4] forward-port changelog and release-notes from 0.4.3.5
by nickm＠torproject.org 15 Jun '20

15 Jun '20

commit 85c0ba1cfb08adb08d674a549d4cfbe7ee050b31 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 15 16:43:09 2020 -0400 forward-port changelog and release-notes from 0.4.3.5 --- ChangeLog | 39 ++++ ReleaseNotes | 614 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 653 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1efcbcf00..9ddbfa95f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,42 @@ +Changes in version 0.4.3.5 - 2020-05-15 + Tor 0.4.3.5 is the first stable release in the 0.4.3.x series. This + series adds support for building without relay code enabled, and + implements functionality needed for OnionBalance with v3 onion + services. It includes significant refactoring of our configuration and + controller functionality, and fixes numerous smaller bugs and + performance issues. + + Per our support policy, we support each stable release series for nine + months after its first stable release, or three months after the first + stable release of the next series: whichever is longer. This means + that 0.4.3.x will be supported until around February 2021--later, if + 0.4.4.x is later than anticipated. + + Note also that support for 0.4.1.x is about to end on May 20 of this + year; 0.4.2.x will be supported until September 15. We still plan to + continue supporting 0.3.5.x, our long-term stable series, until + Feb 2022. + + Below are the changes since 0.4.3.4-rc. For a complete list of changes + since 0.4.2.6, see the ReleaseNotes file. + + o Minor bugfixes (compiler compatibility): + - Avoid compiler warnings from Clang 10 related to the use of GCC- + style "/* falls through */" comments. Both Clang and GCC allow + __attribute__((fallthrough)) instead, so that's what we're using + now. Fixes bug 34078; bugfix on 0.3.1.3-alpha. + - Fix compilation warnings with GCC 10.0.1. Fixes bug 34077; bugfix + on 0.4.0.3-alpha. + + o Minor bugfixes (logging): + - Stop truncating IPv6 addresses and ports in channel and connection + logs. Fixes bug 33918; bugfix on 0.2.4.4-alpha. + - Fix a logic error in a log message about whether an address was + invalid. Previously, the code would never report that onion + addresses were onion addresses. Fixes bug 34131; bugfix + on 0.4.3.1-alpha. + + Changes in version 0.4.3.4-rc - 2020-04-13 Tor 0.4.3.4-rc is the first release candidate in its series. It fixes several bugs from earlier versions, including one affecting DoS diff --git a/ReleaseNotes b/ReleaseNotes index a241da302..a572293c0 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3,6 +3,620 @@ release of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. +Changes in version 0.4.3.5 - 2020-05-15 + Tor 0.4.3.5 is the first stable release in the 0.4.3.x series. This + series adds support for building without relay code enabled, and + implements functionality needed for OnionBalance with v3 onion + services. It includes significant refactoring of our configuration and + controller functionality, and fixes numerous smaller bugs and + performance issues. + + Per our support policy, we support each stable release series for nine + months after its first stable release, or three months after the first + stable release of the next series: whichever is longer. This means + that 0.4.3.x will be supported until around February 2021--later, if + 0.4.4.x is later than anticipated. + + Note also that support for 0.4.1.x is about to end on May 20 of this + year; 0.4.2.x will be supported until September 15. We still plan to + continue supporting 0.3.5.x, our long-term stable series, until + Feb 2022. + + Below are the changes since 0.4.2.6. For a list of only the changes + since 0.4.3.4-rc, see the ChangeLog file. + + o New system requirements: + - When building Tor, you now need to have Python 3 in order to run + the integration tests. (Python 2 is officially unsupported + upstream, as of 1 Jan 2020.) Closes ticket 32608. + + o Major features (build system): + - The relay code can now be disabled using the --disable-module-relay + configure option. When this option is set, we also disable the + dirauth module. Closes ticket 32123. + - When Tor is compiled --disable-module-relay, we also omit the code + used to act as a directory cache. Closes ticket 32487. + + o Major features (directory authority, ed25519): + - Add support for banning a relay's ed25519 keys in the approved- + routers file. This will help us migrate away from RSA keys in the + future. Previously, only RSA keys could be banned in approved- + routers. Resolves ticket 22029. Patch by Neel Chauhan. + + o Major features (onion services): + - New control port commands to manage client-side onion service + authorization credentials. The ONION_CLIENT_AUTH_ADD command adds + a credential, ONION_CLIENT_AUTH_REMOVE deletes a credential, and + ONION_CLIENT_AUTH_VIEW lists the credentials. Closes ticket 30381. + - Introduce a new SocksPort flag, ExtendedErrors, to support more + detailed error codes in information for applications that support + them. Closes ticket 30382; implements proposal 304. + + o Major features (proxy): + - In addition to its current supported proxy types (HTTP CONNECT, + SOCKS4, and SOCKS5), Tor can now make its OR connections through a + HAProxy server. A new torrc option was added to specify the + address/port of the server: TCPProxy <protocol> <host>:<port>. + Currently the only supported protocol for the option is haproxy. + Closes ticket 31518. Patch done by Suphanat Chunhapanya (haxxpop). + + o Major bugfixes (security, denial-of-service): + - Fix a denial-of-service bug that could be used by anyone to + consume a bunch of CPU on any Tor relay or authority, or by + directories to consume a bunch of CPU on clients or hidden + services. Because of the potential for CPU consumption to + introduce observable timing patterns, we are treating this as a + high-severity security issue. Fixes bug 33119; bugfix on + 0.2.1.5-alpha. Found by OSS-Fuzz. We are also tracking this issue + as TROVE-2020-002 and CVE-2020-10592. + + o Major bugfixes (circuit padding, memory leak): + - Avoid a remotely triggered memory leak in the case that a circuit + padding machine is somehow negotiated twice on the same circuit. + Fixes bug 33619; bugfix on 0.4.0.1-alpha. Found by Tobias Pulls. + This is also tracked as TROVE-2020-004 and CVE-2020-10593. + + o Major bugfixes (directory authority): + - Directory authorities will now send a 503 (not enough bandwidth) + code to clients when under bandwidth pressure. Known relays and + other authorities will always be answered regardless of the + bandwidth situation. Fixes bug 33029; bugfix on 0.1.2.5-alpha. + + o Major bugfixes (DoS defenses, bridges, pluggable transport): + - Fix a bug that was preventing DoS defenses from running on bridges + with a pluggable transport. Previously, the DoS subsystem was not + given the transport name of the client connection, thus failed to + find the GeoIP cache entry for that client address. Fixes bug + 33491; bugfix on 0.3.3.2-alpha. + + o Major bugfixes (networking): + - Correctly handle IPv6 addresses in SOCKS5 RESOLVE_PTR requests, + and accept strings as well as binary addresses. Fixes bug 32315; + bugfix on 0.3.5.1-alpha. + + o Major bugfixes (onion service): + - Report HS circuit failure back into the HS subsystem so we take + appropriate action with regards to the client introduction point + failure cache. This improves reachability of onion services, since + now clients notice failing introduction circuits properly. Fixes + bug 32020; bugfix on 0.3.2.1-alpha. + + o Minor feature (heartbeat, onion service): + - Add the DoS INTRODUCE2 defenses counter to the heartbeat DoS + message. Closes ticket 31371. + + o Minor feature (sendme, flow control): + - Default to sending SENDME version 1 cells. (Clients are already + sending these, because of a consensus parameter telling them to do + so: this change only affects what clients would do if the + consensus didn't contain a recommendation.) Closes ticket 33623. + + o Minor features (best practices tracker): + - Practracker now supports a --regen-overbroad option to regenerate + the exceptions file, but only to revise exceptions to be _less_ + tolerant of best-practices violations. Closes ticket 32372. + + o Minor features (configuration validation): + - Configuration validation can now be done by per-module callbacks, + rather than a global validation function. This will let us reduce + the size of config.c and some of its more cumbersome functions. + Closes ticket 31241. + + o Minor features (configuration): + - If a configured hardware crypto accelerator in AccelName is + prefixed with "!", Tor now exits when it cannot be found. Closes + ticket 32406. + - We now use flag-driven logic to warn about obsolete configuration + fields, so that we can include their names. In 0.4.2, we used a + special type, which prevented us from generating good warnings. + Implements ticket 32404. + + o Minor features (configure, build system): + - Output a list of enabled/disabled features at the end of the + configure process in a pleasing way. Closes ticket 31373. + + o Minor features (continuous integration): + - Run Doxygen Makefile target on Travis, so we can learn about + regressions in our internal documentation. Closes ticket 32455. + - Stop allowing failures on the Travis CI stem tests job. It looks + like all the stem hangs we were seeing before are now fixed. + Closes ticket 33075. + + o Minor features (controller): + - Add stream isolation data to STREAM event. Closes ticket 19859. + - Implement a new GETINFO command to fetch microdescriptor + consensus. Closes ticket 31684. + + o Minor features (debugging, directory system): + - Don't crash when we find a non-guard with a guard-fraction value + set. Instead, log a bug warning, in an attempt to figure out how + this happened. Diagnostic for ticket 32868. + + o Minor features (defense in depth): + - Add additional checks around tor_vasprintf() usage, in case the + function returns an error. Patch by Tobias Stoeckmann. Fixes + ticket 31147. + + o Minor features (developer tools): + - Remove the 0.2.9.x series branches from git scripts (git-merge- + forward.sh, git-pull-all.sh, git-push-all.sh, git-setup-dirs.sh). + Closes ticket 32772. + - Add a check_cocci_parse.sh script that checks that new code is + parseable by Coccinelle. Add an exceptions file for unparseable + files, and run the script from travis CI. Closes ticket 31919. + - Call the check_cocci_parse.sh script from a 'check-cocci' Makefile + target. Closes ticket 31919. + - Add a rename_c_identifiers.py tool to rename a bunch of C + identifiers at once, and generate a well-formed commit message + describing the change. This should help with refactoring. Closes + ticket 32237. + - Add some scripts in "scripts/coccinelle" to invoke the Coccinelle + semantic patching tool with the correct flags. These flags are + fairly easy to forget, and these scripts should help us use + Coccinelle more effectively in the future. Closes ticket 31705. + + o Minor features (diagnostic): + - Improve assertions and add some memory-poisoning code to try to + track down possible causes of a rare crash (32564) in the EWMA + code. Closes ticket 33290. + + o Minor features (directory authorities): + - Directory authorities now reject descriptors from relays running + Tor versions from the 0.2.9 and 0.4.0 series. The 0.3.5 series is + still allowed. Resolves ticket 32672. Patch by Neel Chauhan. + + o Minor features (Doxygen): + - Update Doxygen configuration file to a more recent template (from + 1.8.15). Closes ticket 32110. + - "make doxygen" now works with out-of-tree builds. Closes + ticket 32113. + - Make sure that doxygen outputs documentation for all of our C + files. Previously, some were missing @file declarations, causing + them to be ignored. Closes ticket 32307. + - Our "make doxygen" target now respects --enable-fatal-warnings by + default, and does not warn about items that are missing + documentation. To warn about missing documentation, run configure + with the "--enable-missing-doc-warnings" flag: doing so suspends + fatal warnings for doxygen. Closes ticket 32385. + + o Minor features (git scripts): + - Add TOR_EXTRA_CLONE_ARGS to git-setup-dirs.sh for git clone + customisation. Closes ticket 32347. + - Add git-setup-dirs.sh, which sets up an upstream git repository + and worktrees for tor maintainers. Closes ticket 29603. + - Add TOR_EXTRA_REMOTE_* to git-setup-dirs.sh for a custom extra + remote. Closes ticket 32347. + - Call the check_cocci_parse.sh script from the git commit and push + hooks. Closes ticket 31919. + - Make git-push-all.sh skip unchanged branches when pushing to + upstream. The script already skipped unchanged test branches. + Closes ticket 32216. + - Make git-setup-dirs.sh create a master symlink in the worktree + directory. Closes ticket 32347. + - Skip unmodified source files when doing some existing git hook + checks. Related to ticket 31919. + + o Minor features (IPv6, client): + - Make Tor clients tell dual-stack exits that they prefer IPv6 + connections. This change is equivalent to setting the PreferIPv6 + flag on SOCKSPorts (and most other listener ports). Tor Browser + has been setting this flag for some time, and we want to remove a + client distinguisher at exits. Closes ticket 32637. + + o Minor features (portability, android): + - When building for Android, disable some tests that depend on $HOME + and/or pwdb, which Android doesn't have. Closes ticket 32825. + Patch from Hans-Christoph Steiner. + + o Minor features (relay modularity): + - Split the relay and server pluggable transport config code into + separate files in the relay module. Disable this code when the + relay module is disabled. Closes part of ticket 32213. + - When the relay module is disabled, reject attempts to set the + ORPort, DirPort, DirCache, BridgeRelay, ExtORPort, or + ServerTransport* options, rather than ignoring the values of these + options. Closes part of ticket 32213. + - When the relay module is disabled, change the default config so + that DirCache is 0, and ClientOnly is 1. Closes ticket 32410. + + o Minor features (release tools): + - Port our ChangeLog formatting and sorting tools to Python 3. + Closes ticket 32704. + + o Minor features (testing): + - The unit tests now support a "TOR_SKIP_TESTCASES" environment + variable to specify a list of space-separated test cases that + should not be executed. We will use this to disable certain tests + that are failing on Appveyor because of mismatched OpenSSL + libraries. Part of ticket 33643. + - Detect some common failure cases for test_parseconf.sh in + src/test/conf_failures. Closes ticket 32451. + - Allow test_parseconf.sh to test expected log outputs for successful + configs, as well as failed configs. Closes ticket 32451. + - The test_parseconf.sh script now supports result variants for any + combination of the optional libraries lzma, nss, and zstd. Closes + ticket 32397. + - When running the unit tests on Android, create temporary files in + a subdirectory of /data/local/tmp. Closes ticket 32172. Based on a + patch from Hans-Christoph Steiner. + + o Minor features (usability): + - Include more information when failing to parse a configuration + value. This should make it easier to tell what's going wrong when + a configuration file doesn't parse. Closes ticket 33460. + + o Minor bugfix (relay, configuration): + - Warn if the ContactInfo field is not set, and tell the relay + operator that not having a ContactInfo field set might cause their + relay to get rejected in the future. Fixes bug 33361; bugfix + on 0.1.1.10-alpha. + + o Minor bugfixes (bridges): + - Lowercase the configured value of BridgeDistribution before adding + it to the descriptor. Fixes bug 32753; bugfix on 0.3.2.3-alpha. + + o Minor bugfixes (build system): + - Fix "make autostyle" for out-of-tree builds. Fixes bug 32370; + bugfix on 0.4.1.2-alpha. + + o Minor bugfixes (compiler compatibility): + - Avoid compiler warnings from Clang 10 related to the use of GCC- + style "/* falls through */" comments. Both Clang and GCC allow + __attribute__((fallthrough)) instead, so that's what we're using + now. Fixes bug 34078; bugfix on 0.3.1.3-alpha. + - Fix compilation warnings with GCC 10.0.1. Fixes bug 34077; bugfix + on 0.4.0.3-alpha. + + o Minor bugfixes (configuration handling): + - Make control_event_conf_changed() take in a config_line_t instead + of a smartlist of alternating key/value entries. Fixes bug 31531; + bugfix on 0.2.3.3-alpha. Patch by Neel Chauhan. + - Check for multiplication overflow when parsing memory units inside + configuration. Fixes bug 30920; bugfix on 0.0.9rc1. + - When dumping the configuration, stop adding a trailing space after + the option name when there is no option value. This issue only + affects options that accept an empty value or list. (Most options + reject empty values, or delete the entire line from the dumped + options.) Fixes bug 32352; bugfix on 0.0.9pre6. + - Avoid changing the user's value of HardwareAccel as stored by + SAVECONF, when AccelName is set but HardwareAccel is not. Fixes + bug 32382; bugfix on 0.2.2.1-alpha. + - When creating a KeyDirectory with the same location as the + DataDirectory (not recommended), respect the DataDirectory's + group-readable setting if one has not been set for the + KeyDirectory. Fixes bug 27992; bugfix on 0.3.3.1-alpha. + + o Minor bugfixes (continuous integration): + - Remove the buggy and unused mirroring job. Fixes bug 33213; bugfix + on 0.3.2.2-alpha. + + o Minor bugfixes (controller protocol): + - When receiving "ACTIVE" or "DORMANT" signals on the control port, + report them as SIGNAL events. Previously we would log a bug + warning. Fixes bug 33104; bugfix on 0.4.0.1-alpha. + + o Minor bugfixes (controller): + - In routerstatus_has_changed(), check all the fields that are + output over the control port. Fixes bug 20218; bugfix + on 0.1.1.11-alpha. + + o Minor bugfixes (developer tools): + - Allow paths starting with ./ in scripts/add_c_file.py. Fixes bug + 31336; bugfix on 0.4.1.2-alpha. + + o Minor bugfixes (dirauth module): + - Split the dirauth config code into a separate file in the dirauth + module. Disable this code when the dirauth module is disabled. + Closes ticket 32213. + - When the dirauth module is disabled, reject attempts to set the + AuthoritativeDir option, rather than ignoring the value of the + option. Fixes bug 32213; bugfix on 0.3.4.1-alpha. + + o Minor bugfixes (embedded Tor): + - When starting Tor any time after the first time in a process, + register the thread in which it is running as the main thread. + Previously, we only did this on Windows, which could lead to bugs + like 23081 on non-Windows platforms. Fixes bug 32884; bugfix + on 0.3.3.1-alpha. + + o Minor bugfixes (git scripts): + - Avoid sleeping before the last push in git-push-all.sh. Closes + ticket 32216. + - Forward all unrecognised arguments in git-push-all.sh to git push. + Closes ticket 32216. + + o Minor bugfixes (key portability): + - When reading PEM-encoded key data, tolerate CRLF line-endings even + if we are not running on Windows. Previously, non-Windows hosts + would reject these line-endings in certain positions, making + certain key files hard to move from one host to another. Fixes bug + 33032; bugfix on 0.3.5.1-alpha. + + o Minor bugfixes (logging): + - Stop truncating IPv6 addresses and ports in channel and connection + logs. Fixes bug 33918; bugfix on 0.2.4.4-alpha. + - Flush stderr, stdout, and file logs during shutdown, if supported + by the OS. This change helps make sure that any final logs are + recorded. Fixes bug 33087; bugfix on 0.4.1.6. + - Stop closing stderr and stdout during shutdown. Closing these file + descriptors can hide sanitiser logs. Fixes bug 33087; bugfix + on 0.4.1.6. + - If we encounter a bug when flushing a buffer to a TLS connection, + only log the bug once per invocation of the Tor process. + Previously we would log with every occurrence, which could cause + us to run out of disk space. Fixes bug 33093; bugfix + on 0.3.2.2-alpha. + - When logging a bug, do not say "Future instances of this warning + will be silenced" unless we are actually going to silence them. + Previously we would say this whenever a BUG() check failed in the + code. Fixes bug 33095; bugfix on 0.4.1.1-alpha. + + o Minor bugfixes (onion services v2): + - Move a series of v2 onion service warnings to protocol-warning + level because they can all be triggered remotely by a malformed + request. Fixes bug 32706; bugfix on 0.1.1.14-alpha. + - When sending the INTRO cell for a v2 Onion Service, look at the + failure cache alongside timeout values to check if the intro point + is marked as failed. Previously, we only looked at the relay + timeout values. Fixes bug 25568; bugfix on 0.2.7.3-rc. Patch by + Neel Chauhan. + + o Minor bugfixes (onion services v3): + - Remove a BUG() warning that would cause a stack trace if an onion + service descriptor was freed while we were waiting for a + rendezvous circuit to complete. Fixes bug 28992; bugfix + on 0.3.2.1-alpha. + - Relax severity of a log message that can appear naturally when + decoding onion service descriptors as a relay. Also add some + diagnostics to debug any future bugs in that area. Fixes bug + 31669; bugfix on 0.3.0.1-alpha. + - Fix an assertion failure that could result from a corrupted + ADD_ONION control port command. Found by Saibato. Fixes bug 33137; + bugfix on 0.3.3.1-alpha. This issue is also tracked + as TROVE-2020-003. + - Properly handle the client rendezvous circuit timeout. Previously + Tor would sometimes timeout a rendezvous circuit awaiting the + introduction ACK, and find itself unable to re-establish all + circuits because the rendezvous circuit timed out too early. Fixes + bug 32021; bugfix on 0.3.2.1-alpha. + + o Minor bugfixes (onion services): + - Do not rely on a "circuit established" flag for intro circuits but + instead always query the HS circuit map. This is to avoid sync + issue with that flag and the map. Fixes bug 32094; bugfix + on 0.3.2.1-alpha. + + o Minor bugfixes (onion services, all): + - In cancel_descriptor_fetches(), use + connection_list_by_type_purpose() instead of + connection_list_by_type_state(). Fixes bug 32639; bugfix on + 0.3.2.1-alpha. Patch by Neel Chauhan. + + o Minor bugfixes (pluggable transports): + - When receiving a message on standard error from a pluggable + transport, log it at info level, rather than as a warning. Fixes + bug 33005; bugfix on 0.4.0.1-alpha. + + o Minor bugfixes (rust, build): + - Fix a syntax warning given by newer versions of Rust that was + creating problems for our continuous integration. Fixes bug 33212; + bugfix on 0.3.5.1-alpha. + + o Minor bugfixes (scripts): + - Fix update_versions.py for out-of-tree builds. Fixes bug 32371; + bugfix on 0.4.0.1-alpha. + + o Minor bugfixes (testing): + - Use the same code to find the tor binary in all of our test + scripts. This change makes sure we are always using the coverage + binary when coverage is enabled. Fixes bug 32368; bugfix + on 0.2.7.3-rc. + - Stop ignoring "tor --dump-config" errors in test_parseconf.sh. + Fixes bug 32468; bugfix on 0.4.2.1-alpha. + - Our option-validation tests no longer depend on specially + configured non-default, non-passing sets of options. Previously, + the tests had been written to assume that options would _not_ be + set to their defaults, which led to needless complexity and + verbosity. Fixes bug 32175; bugfix on 0.2.8.1-alpha. + + o Minor bugfixes (TLS bug handling): + - When encountering a bug in buf_read_from_tls(), return a "MISC" + error code rather than "WANTWRITE". This change might help avoid + some CPU-wasting loops if the bug is ever triggered. Bug reported + by opara. Fixes bug 32673; bugfix on 0.3.0.4-alpha. + + o Deprecated features: + - Deprecate the ClientAutoIPv6ORPort option. This option was not + true "Happy Eyeballs", and often failed on connections that + weren't reliably dual-stack. Closes ticket 32942. Patch by + Neel Chauhan. + + o Documentation: + - Provide a quickstart guide for a Circuit Padding Framework, and + documentation for researchers to implement and study circuit + padding machines. Closes ticket 28804. + - Add documentation in 'HelpfulTools.md' to describe how to build a + tag file. Closes ticket 32779. + - Create a high-level description of the long-term software + architecture goals. Closes ticket 32206. + - Describe the --dump-config command in the manual page. Closes + ticket 32467. + - Unite coding advice from this_not_that.md in torguts repo into our + coding standards document. Resolves ticket 31853. + + o Removed features: + - Our Doxygen configuration no longer generates LaTeX output. The + reference manual produced by doing this was over 4000 pages long, + and generally unusable. Closes ticket 32099. + - The option "TestingEstimatedDescriptorPropagationTime" is now + marked as obsolete. It has had no effect since 0.3.0.7, when + clients stopped rejecting consensuses "from the future". Closes + ticket 32807. + - We no longer support consensus methods before method 28; these + methods were only used by authorities running versions of Tor that + are now at end-of-life. In effect, this means that clients, + relays, and authorities now assume that authorities will be + running version 0.3.5.x or later. Closes ticket 32695. + + o Testing: + - Avoid conflicts between the fake sockets in tor's unit tests, and + real file descriptors. Resolves issues running unit tests with + GitHub Actions, where the process that embeds or launches the + tests has already opened a large number of file descriptors. Fixes + bug 33782; bugfix on 0.2.8.1-alpha. Found and fixed by + Putta Khunchalee. + - Add more test cases for tor's UTF-8 validation function. Also, + check the arguments passed to the function for consistency. Closes + ticket 32845. + - Improve test coverage for relay and dirauth config code, focusing + on option validation and normalization. Closes ticket 32213. + - Improve the consistency of test_parseconf.sh output, and run all + the tests, even if one fails. Closes ticket 32213. + - Run the practracker unit tests in the pre-commit git hook. Closes + ticket 32609. + + o Code simplification and refactoring (channel): + - Channel layer had a variable length cell handler that was not used + and thus removed. Closes ticket 32892. + + o Code simplification and refactoring (configuration): + - Immutability is now implemented as a flag on individual + configuration options rather than as part of the option-transition + checking code. Closes ticket 32344. + - Instead of keeping a list of configuration options to check for + relative paths, check all the options whose type is "FILENAME". + Solves part of ticket 32339. + - Our default log (which ordinarily sends NOTICE-level messages to + standard output) is now handled in a more logical manner. + Previously, we replaced the configured log options if they were + empty. Now, we interpret an empty set of log options as meaning + "use the default log". Closes ticket 31999. + - Remove some unused arguments from the options_validate() function, + to simplify our code and tests. Closes ticket 32187. + - Simplify the options_validate() code so that it looks at the + default options directly, rather than taking default options as an + argument. This change lets us simplify its interface. Closes + ticket 32185. + - Use our new configuration architecture to move most authority- + related options to the directory authority module. Closes + ticket 32806. + - When parsing the command line, handle options that determine our + "quiet level" and our mode of operation (e.g., --dump-config and + so on) all in one table. Closes ticket 32003. + + o Code simplification and refactoring (controller): + - Create a new abstraction for formatting control protocol reply + lines based on key-value pairs. Refactor some existing control + protocol code to take advantage of this. Closes ticket 30984. + - Create a helper function that can fetch network status or + microdesc consensuses. Closes ticket 31684. + + o Code simplification and refactoring (dirauth modularization): + - Remove the last remaining HAVE_MODULE_DIRAUTH inside a function. + Closes ticket 32163. + - Replace some confusing identifiers in process_descs.c. Closes + ticket 29826. + - Simplify some relay and dirauth config code. Closes ticket 32213. + + o Code simplification and refactoring (mainloop): + - Simplify the ip_address_changed() function by removing redundant + checks. Closes ticket 33091. + + o Code simplification and refactoring (misc): + - Make all the structs we declare follow the same naming convention + of ending with "_t". Closes ticket 32415. + - Move and rename some configuration-related code for clarity. + Closes ticket 32304. + - Our include.am files are now broken up by subdirectory. + Previously, src/core/include.am covered all of the subdirectories + in "core", "feature", and "app". Closes ticket 32137. + - Remove underused NS*() macros from test code: they make our tests + more confusing, especially for code-formatting tools. Closes + ticket 32887. + + o Code simplification and refactoring (relay modularization): + - Disable relay_periodic when the relay module is disabled. Closes + ticket 32244. + - Disable relay_sys when the relay module is disabled. Closes + ticket 32245. + + o Code simplification and refactoring (tool support): + - Add numerous missing dependencies to our include files, so that + they can be included in different reasonable orders and still + compile. Addresses part of ticket 32764. + - Fix some parts of our code that were difficult for Coccinelle to + parse. Related to ticket 31705. + - Fix some small issues in our code that prevented automatic + formatting tools from working. Addresses part of ticket 32764. + + o Documentation (manpage): + - Alphabetize the Server and Directory server sections of the tor + manpage. Also split Statistics options into their own section of + the manpage. Closes ticket 33188. Work by Swati Thacker as part of + Google Season of Docs. + - Document the __OwningControllerProcess torrc option and specify + its polling interval. Resolves issue 32971. + - Split "Circuit Timeout" options and "Node Selection" options into + their own sections of the tor manpage. Closes tickets 32928 and + 32929. Work by Swati Thacker as part of Google Season of Docs. + - Alphabetize the Client Options section of the tor manpage. Closes + ticket 32846. + - Alphabetize the General Options section of the tor manpage. Closes + ticket 32708. + - In the tor(1) manpage, reword and improve formatting of the + COMMAND-LINE OPTIONS and DESCRIPTION sections. Closes ticket + 32277. Based on work by Swati Thacker as part of Google Season + of Docs. + - In the tor(1) manpage, reword and improve formatting of the FILES, + SEE ALSO, and BUGS sections. Closes ticket 32176. Based on work by + Swati Thacker as part of Google Season of Docs. + + o Testing (Appveyor CI): + - In our Appveyor Windows CI, copy required DLLs to test and app + directories, before running tor's tests. This ensures that tor.exe + and test*.exe use the correct version of each DLL. This fix is not + required, but we hope it will avoid DLL search issues in future. + Fixes bug 33673; bugfix on 0.3.4.2-alpha. + - On Appveyor, skip the crypto/openssl_version test, which is + failing because of a mismatched library installation. Fix + for 33643. + + o Testing (circuit, EWMA): + - Add unit tests for circuitmux and EWMA subsystems. Closes + ticket 32196. + + o Testing (Travis CI): + - Remove a redundant distcheck job. Closes ticket 33194. + - Sort the Travis jobs in order of speed: putting the slowest jobs + first takes full advantage of Travis job concurrency. Closes + ticket 33194. + - Stop allowing the Chutney IPv6 Travis job to fail. This job was + previously configured to fast_finish (which requires + allow_failure), to speed up the build. Closes ticket 33195. + - When a Travis chutney job fails, use chutney's new "diagnostics.sh" + tool to produce detailed diagnostic output. Closes ticket 32792. + + Changes in version 0.4.2.7 - 2020-03-18 This is the third stable release in the 0.4.2.x series. It backports numerous fixes from later releases, including a fix for TROVE-2020-

1 0

[tor/master] forward-port changelog and release-notes from 0.4.3.5
by nickm＠torproject.org 15 Jun '20

15 Jun '20

commit 85c0ba1cfb08adb08d674a549d4cfbe7ee050b31 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 15 16:43:09 2020 -0400 forward-port changelog and release-notes from 0.4.3.5 --- ChangeLog | 39 ++++ ReleaseNotes | 614 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 653 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1efcbcf00..9ddbfa95f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,42 @@ +Changes in version 0.4.3.5 - 2020-05-15 + Tor 0.4.3.5 is the first stable release in the 0.4.3.x series. This + series adds support for building without relay code enabled, and + implements functionality needed for OnionBalance with v3 onion + services. It includes significant refactoring of our configuration and + controller functionality, and fixes numerous smaller bugs and + performance issues. + + Per our support policy, we support each stable release series for nine + months after its first stable release, or three months after the first + stable release of the next series: whichever is longer. This means + that 0.4.3.x will be supported until around February 2021--later, if + 0.4.4.x is later than anticipated. + + Note also that support for 0.4.1.x is about to end on May 20 of this + year; 0.4.2.x will be supported until September 15. We still plan to + continue supporting 0.3.5.x, our long-term stable series, until + Feb 2022. + + Below are the changes since 0.4.3.4-rc. For a complete list of changes + since 0.4.2.6, see the ReleaseNotes file. + + o Minor bugfixes (compiler compatibility): + - Avoid compiler warnings from Clang 10 related to the use of GCC- + style "/* falls through */" comments. Both Clang and GCC allow + __attribute__((fallthrough)) instead, so that's what we're using + now. Fixes bug 34078; bugfix on 0.3.1.3-alpha. + - Fix compilation warnings with GCC 10.0.1. Fixes bug 34077; bugfix + on 0.4.0.3-alpha. + + o Minor bugfixes (logging): + - Stop truncating IPv6 addresses and ports in channel and connection + logs. Fixes bug 33918; bugfix on 0.2.4.4-alpha. + - Fix a logic error in a log message about whether an address was + invalid. Previously, the code would never report that onion + addresses were onion addresses. Fixes bug 34131; bugfix + on 0.4.3.1-alpha. + + Changes in version 0.4.3.4-rc - 2020-04-13 Tor 0.4.3.4-rc is the first release candidate in its series. It fixes several bugs from earlier versions, including one affecting DoS diff --git a/ReleaseNotes b/ReleaseNotes index a241da302..a572293c0 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3,6 +3,620 @@ release of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. +Changes in version 0.4.3.5 - 2020-05-15 + Tor 0.4.3.5 is the first stable release in the 0.4.3.x series. This + series adds support for building without relay code enabled, and + implements functionality needed for OnionBalance with v3 onion + services. It includes significant refactoring of our configuration and + controller functionality, and fixes numerous smaller bugs and + performance issues. + + Per our support policy, we support each stable release series for nine + months after its first stable release, or three months after the first + stable release of the next series: whichever is longer. This means + that 0.4.3.x will be supported until around February 2021--later, if + 0.4.4.x is later than anticipated. + + Note also that support for 0.4.1.x is about to end on May 20 of this + year; 0.4.2.x will be supported until September 15. We still plan to + continue supporting 0.3.5.x, our long-term stable series, until + Feb 2022. + + Below are the changes since 0.4.2.6. For a list of only the changes + since 0.4.3.4-rc, see the ChangeLog file. + + o New system requirements: + - When building Tor, you now need to have Python 3 in order to run + the integration tests. (Python 2 is officially unsupported + upstream, as of 1 Jan 2020.) Closes ticket 32608. + + o Major features (build system): + - The relay code can now be disabled using the --disable-module-relay + configure option. When this option is set, we also disable the + dirauth module. Closes ticket 32123. + - When Tor is compiled --disable-module-relay, we also omit the code + used to act as a directory cache. Closes ticket 32487. + + o Major features (directory authority, ed25519): + - Add support for banning a relay's ed25519 keys in the approved- + routers file. This will help us migrate away from RSA keys in the + future. Previously, only RSA keys could be banned in approved- + routers. Resolves ticket 22029. Patch by Neel Chauhan. + + o Major features (onion services): + - New control port commands to manage client-side onion service + authorization credentials. The ONION_CLIENT_AUTH_ADD command adds + a credential, ONION_CLIENT_AUTH_REMOVE deletes a credential, and + ONION_CLIENT_AUTH_VIEW lists the credentials. Closes ticket 30381. + - Introduce a new SocksPort flag, ExtendedErrors, to support more + detailed error codes in information for applications that support + them. Closes ticket 30382; implements proposal 304. + + o Major features (proxy): + - In addition to its current supported proxy types (HTTP CONNECT, + SOCKS4, and SOCKS5), Tor can now make its OR connections through a + HAProxy server. A new torrc option was added to specify the + address/port of the server: TCPProxy <protocol> <host>:<port>. + Currently the only supported protocol for the option is haproxy. + Closes ticket 31518. Patch done by Suphanat Chunhapanya (haxxpop). + + o Major bugfixes (security, denial-of-service): + - Fix a denial-of-service bug that could be used by anyone to + consume a bunch of CPU on any Tor relay or authority, or by + directories to consume a bunch of CPU on clients or hidden + services. Because of the potential for CPU consumption to + introduce observable timing patterns, we are treating this as a + high-severity security issue. Fixes bug 33119; bugfix on + 0.2.1.5-alpha. Found by OSS-Fuzz. We are also tracking this issue + as TROVE-2020-002 and CVE-2020-10592. + + o Major bugfixes (circuit padding, memory leak): + - Avoid a remotely triggered memory leak in the case that a circuit + padding machine is somehow negotiated twice on the same circuit. + Fixes bug 33619; bugfix on 0.4.0.1-alpha. Found by Tobias Pulls. + This is also tracked as TROVE-2020-004 and CVE-2020-10593. + + o Major bugfixes (directory authority): + - Directory authorities will now send a 503 (not enough bandwidth) + code to clients when under bandwidth pressure. Known relays and + other authorities will always be answered regardless of the + bandwidth situation. Fixes bug 33029; bugfix on 0.1.2.5-alpha. + + o Major bugfixes (DoS defenses, bridges, pluggable transport): + - Fix a bug that was preventing DoS defenses from running on bridges + with a pluggable transport. Previously, the DoS subsystem was not + given the transport name of the client connection, thus failed to + find the GeoIP cache entry for that client address. Fixes bug + 33491; bugfix on 0.3.3.2-alpha. + + o Major bugfixes (networking): + - Correctly handle IPv6 addresses in SOCKS5 RESOLVE_PTR requests, + and accept strings as well as binary addresses. Fixes bug 32315; + bugfix on 0.3.5.1-alpha. + + o Major bugfixes (onion service): + - Report HS circuit failure back into the HS subsystem so we take + appropriate action with regards to the client introduction point + failure cache. This improves reachability of onion services, since + now clients notice failing introduction circuits properly. Fixes + bug 32020; bugfix on 0.3.2.1-alpha. + + o Minor feature (heartbeat, onion service): + - Add the DoS INTRODUCE2 defenses counter to the heartbeat DoS + message. Closes ticket 31371. + + o Minor feature (sendme, flow control): + - Default to sending SENDME version 1 cells. (Clients are already + sending these, because of a consensus parameter telling them to do + so: this change only affects what clients would do if the + consensus didn't contain a recommendation.) Closes ticket 33623. + + o Minor features (best practices tracker): + - Practracker now supports a --regen-overbroad option to regenerate + the exceptions file, but only to revise exceptions to be _less_ + tolerant of best-practices violations. Closes ticket 32372. + + o Minor features (configuration validation): + - Configuration validation can now be done by per-module callbacks, + rather than a global validation function. This will let us reduce + the size of config.c and some of its more cumbersome functions. + Closes ticket 31241. + + o Minor features (configuration): + - If a configured hardware crypto accelerator in AccelName is + prefixed with "!", Tor now exits when it cannot be found. Closes + ticket 32406. + - We now use flag-driven logic to warn about obsolete configuration + fields, so that we can include their names. In 0.4.2, we used a + special type, which prevented us from generating good warnings. + Implements ticket 32404. + + o Minor features (configure, build system): + - Output a list of enabled/disabled features at the end of the + configure process in a pleasing way. Closes ticket 31373. + + o Minor features (continuous integration): + - Run Doxygen Makefile target on Travis, so we can learn about + regressions in our internal documentation. Closes ticket 32455. + - Stop allowing failures on the Travis CI stem tests job. It looks + like all the stem hangs we were seeing before are now fixed. + Closes ticket 33075. + + o Minor features (controller): + - Add stream isolation data to STREAM event. Closes ticket 19859. + - Implement a new GETINFO command to fetch microdescriptor + consensus. Closes ticket 31684. + + o Minor features (debugging, directory system): + - Don't crash when we find a non-guard with a guard-fraction value + set. Instead, log a bug warning, in an attempt to figure out how + this happened. Diagnostic for ticket 32868. + + o Minor features (defense in depth): + - Add additional checks around tor_vasprintf() usage, in case the + function returns an error. Patch by Tobias Stoeckmann. Fixes + ticket 31147. + + o Minor features (developer tools): + - Remove the 0.2.9.x series branches from git scripts (git-merge- + forward.sh, git-pull-all.sh, git-push-all.sh, git-setup-dirs.sh). + Closes ticket 32772. + - Add a check_cocci_parse.sh script that checks that new code is + parseable by Coccinelle. Add an exceptions file for unparseable + files, and run the script from travis CI. Closes ticket 31919. + - Call the check_cocci_parse.sh script from a 'check-cocci' Makefile + target. Closes ticket 31919. + - Add a rename_c_identifiers.py tool to rename a bunch of C + identifiers at once, and generate a well-formed commit message + describing the change. This should help with refactoring. Closes + ticket 32237. + - Add some scripts in "scripts/coccinelle" to invoke the Coccinelle + semantic patching tool with the correct flags. These flags are + fairly easy to forget, and these scripts should help us use + Coccinelle more effectively in the future. Closes ticket 31705. + + o Minor features (diagnostic): + - Improve assertions and add some memory-poisoning code to try to + track down possible causes of a rare crash (32564) in the EWMA + code. Closes ticket 33290. + + o Minor features (directory authorities): + - Directory authorities now reject descriptors from relays running + Tor versions from the 0.2.9 and 0.4.0 series. The 0.3.5 series is + still allowed. Resolves ticket 32672. Patch by Neel Chauhan. + + o Minor features (Doxygen): + - Update Doxygen configuration file to a more recent template (from + 1.8.15). Closes ticket 32110. + - "make doxygen" now works with out-of-tree builds. Closes + ticket 32113. + - Make sure that doxygen outputs documentation for all of our C + files. Previously, some were missing @file declarations, causing + them to be ignored. Closes ticket 32307. + - Our "make doxygen" target now respects --enable-fatal-warnings by + default, and does not warn about items that are missing + documentation. To warn about missing documentation, run configure + with the "--enable-missing-doc-warnings" flag: doing so suspends + fatal warnings for doxygen. Closes ticket 32385. + + o Minor features (git scripts): + - Add TOR_EXTRA_CLONE_ARGS to git-setup-dirs.sh for git clone + customisation. Closes ticket 32347. + - Add git-setup-dirs.sh, which sets up an upstream git repository + and worktrees for tor maintainers. Closes ticket 29603. + - Add TOR_EXTRA_REMOTE_* to git-setup-dirs.sh for a custom extra + remote. Closes ticket 32347. + - Call the check_cocci_parse.sh script from the git commit and push + hooks. Closes ticket 31919. + - Make git-push-all.sh skip unchanged branches when pushing to + upstream. The script already skipped unchanged test branches. + Closes ticket 32216. + - Make git-setup-dirs.sh create a master symlink in the worktree + directory. Closes ticket 32347. + - Skip unmodified source files when doing some existing git hook + checks. Related to ticket 31919. + + o Minor features (IPv6, client): + - Make Tor clients tell dual-stack exits that they prefer IPv6 + connections. This change is equivalent to setting the PreferIPv6 + flag on SOCKSPorts (and most other listener ports). Tor Browser + has been setting this flag for some time, and we want to remove a + client distinguisher at exits. Closes ticket 32637. + + o Minor features (portability, android): + - When building for Android, disable some tests that depend on $HOME + and/or pwdb, which Android doesn't have. Closes ticket 32825. + Patch from Hans-Christoph Steiner. + + o Minor features (relay modularity): + - Split the relay and server pluggable transport config code into + separate files in the relay module. Disable this code when the + relay module is disabled. Closes part of ticket 32213. + - When the relay module is disabled, reject attempts to set the + ORPort, DirPort, DirCache, BridgeRelay, ExtORPort, or + ServerTransport* options, rather than ignoring the values of these + options. Closes part of ticket 32213. + - When the relay module is disabled, change the default config so + that DirCache is 0, and ClientOnly is 1. Closes ticket 32410. + + o Minor features (release tools): + - Port our ChangeLog formatting and sorting tools to Python 3. + Closes ticket 32704. + + o Minor features (testing): + - The unit tests now support a "TOR_SKIP_TESTCASES" environment + variable to specify a list of space-separated test cases that + should not be executed. We will use this to disable certain tests + that are failing on Appveyor because of mismatched OpenSSL + libraries. Part of ticket 33643. + - Detect some common failure cases for test_parseconf.sh in + src/test/conf_failures. Closes ticket 32451. + - Allow test_parseconf.sh to test expected log outputs for successful + configs, as well as failed configs. Closes ticket 32451. + - The test_parseconf.sh script now supports result variants for any + combination of the optional libraries lzma, nss, and zstd. Closes + ticket 32397. + - When running the unit tests on Android, create temporary files in + a subdirectory of /data/local/tmp. Closes ticket 32172. Based on a + patch from Hans-Christoph Steiner. + + o Minor features (usability): + - Include more information when failing to parse a configuration + value. This should make it easier to tell what's going wrong when + a configuration file doesn't parse. Closes ticket 33460. + + o Minor bugfix (relay, configuration): + - Warn if the ContactInfo field is not set, and tell the relay + operator that not having a ContactInfo field set might cause their + relay to get rejected in the future. Fixes bug 33361; bugfix + on 0.1.1.10-alpha. + + o Minor bugfixes (bridges): + - Lowercase the configured value of BridgeDistribution before adding + it to the descriptor. Fixes bug 32753; bugfix on 0.3.2.3-alpha. + + o Minor bugfixes (build system): + - Fix "make autostyle" for out-of-tree builds. Fixes bug 32370; + bugfix on 0.4.1.2-alpha. + + o Minor bugfixes (compiler compatibility): + - Avoid compiler warnings from Clang 10 related to the use of GCC- + style "/* falls through */" comments. Both Clang and GCC allow + __attribute__((fallthrough)) instead, so that's what we're using + now. Fixes bug 34078; bugfix on 0.3.1.3-alpha. + - Fix compilation warnings with GCC 10.0.1. Fixes bug 34077; bugfix + on 0.4.0.3-alpha. + + o Minor bugfixes (configuration handling): + - Make control_event_conf_changed() take in a config_line_t instead + of a smartlist of alternating key/value entries. Fixes bug 31531; + bugfix on 0.2.3.3-alpha. Patch by Neel Chauhan. + - Check for multiplication overflow when parsing memory units inside + configuration. Fixes bug 30920; bugfix on 0.0.9rc1. + - When dumping the configuration, stop adding a trailing space after + the option name when there is no option value. This issue only + affects options that accept an empty value or list. (Most options + reject empty values, or delete the entire line from the dumped + options.) Fixes bug 32352; bugfix on 0.0.9pre6. + - Avoid changing the user's value of HardwareAccel as stored by + SAVECONF, when AccelName is set but HardwareAccel is not. Fixes + bug 32382; bugfix on 0.2.2.1-alpha. + - When creating a KeyDirectory with the same location as the + DataDirectory (not recommended), respect the DataDirectory's + group-readable setting if one has not been set for the + KeyDirectory. Fixes bug 27992; bugfix on 0.3.3.1-alpha. + + o Minor bugfixes (continuous integration): + - Remove the buggy and unused mirroring job. Fixes bug 33213; bugfix + on 0.3.2.2-alpha. + + o Minor bugfixes (controller protocol): + - When receiving "ACTIVE" or "DORMANT" signals on the control port, + report them as SIGNAL events. Previously we would log a bug + warning. Fixes bug 33104; bugfix on 0.4.0.1-alpha. + + o Minor bugfixes (controller): + - In routerstatus_has_changed(), check all the fields that are + output over the control port. Fixes bug 20218; bugfix + on 0.1.1.11-alpha. + + o Minor bugfixes (developer tools): + - Allow paths starting with ./ in scripts/add_c_file.py. Fixes bug + 31336; bugfix on 0.4.1.2-alpha. + + o Minor bugfixes (dirauth module): + - Split the dirauth config code into a separate file in the dirauth + module. Disable this code when the dirauth module is disabled. + Closes ticket 32213. + - When the dirauth module is disabled, reject attempts to set the + AuthoritativeDir option, rather than ignoring the value of the + option. Fixes bug 32213; bugfix on 0.3.4.1-alpha. + + o Minor bugfixes (embedded Tor): + - When starting Tor any time after the first time in a process, + register the thread in which it is running as the main thread. + Previously, we only did this on Windows, which could lead to bugs + like 23081 on non-Windows platforms. Fixes bug 32884; bugfix + on 0.3.3.1-alpha. + + o Minor bugfixes (git scripts): + - Avoid sleeping before the last push in git-push-all.sh. Closes + ticket 32216. + - Forward all unrecognised arguments in git-push-all.sh to git push. + Closes ticket 32216. + + o Minor bugfixes (key portability): + - When reading PEM-encoded key data, tolerate CRLF line-endings even + if we are not running on Windows. Previously, non-Windows hosts + would reject these line-endings in certain positions, making + certain key files hard to move from one host to another. Fixes bug + 33032; bugfix on 0.3.5.1-alpha. + + o Minor bugfixes (logging): + - Stop truncating IPv6 addresses and ports in channel and connection + logs. Fixes bug 33918; bugfix on 0.2.4.4-alpha. + - Flush stderr, stdout, and file logs during shutdown, if supported + by the OS. This change helps make sure that any final logs are + recorded. Fixes bug 33087; bugfix on 0.4.1.6. + - Stop closing stderr and stdout during shutdown. Closing these file + descriptors can hide sanitiser logs. Fixes bug 33087; bugfix + on 0.4.1.6. + - If we encounter a bug when flushing a buffer to a TLS connection, + only log the bug once per invocation of the Tor process. + Previously we would log with every occurrence, which could cause + us to run out of disk space. Fixes bug 33093; bugfix + on 0.3.2.2-alpha. + - When logging a bug, do not say "Future instances of this warning + will be silenced" unless we are actually going to silence them. + Previously we would say this whenever a BUG() check failed in the + code. Fixes bug 33095; bugfix on 0.4.1.1-alpha. + + o Minor bugfixes (onion services v2): + - Move a series of v2 onion service warnings to protocol-warning + level because they can all be triggered remotely by a malformed + request. Fixes bug 32706; bugfix on 0.1.1.14-alpha. + - When sending the INTRO cell for a v2 Onion Service, look at the + failure cache alongside timeout values to check if the intro point + is marked as failed. Previously, we only looked at the relay + timeout values. Fixes bug 25568; bugfix on 0.2.7.3-rc. Patch by + Neel Chauhan. + + o Minor bugfixes (onion services v3): + - Remove a BUG() warning that would cause a stack trace if an onion + service descriptor was freed while we were waiting for a + rendezvous circuit to complete. Fixes bug 28992; bugfix + on 0.3.2.1-alpha. + - Relax severity of a log message that can appear naturally when + decoding onion service descriptors as a relay. Also add some + diagnostics to debug any future bugs in that area. Fixes bug + 31669; bugfix on 0.3.0.1-alpha. + - Fix an assertion failure that could result from a corrupted + ADD_ONION control port command. Found by Saibato. Fixes bug 33137; + bugfix on 0.3.3.1-alpha. This issue is also tracked + as TROVE-2020-003. + - Properly handle the client rendezvous circuit timeout. Previously + Tor would sometimes timeout a rendezvous circuit awaiting the + introduction ACK, and find itself unable to re-establish all + circuits because the rendezvous circuit timed out too early. Fixes + bug 32021; bugfix on 0.3.2.1-alpha. + + o Minor bugfixes (onion services): + - Do not rely on a "circuit established" flag for intro circuits but + instead always query the HS circuit map. This is to avoid sync + issue with that flag and the map. Fixes bug 32094; bugfix + on 0.3.2.1-alpha. + + o Minor bugfixes (onion services, all): + - In cancel_descriptor_fetches(), use + connection_list_by_type_purpose() instead of + connection_list_by_type_state(). Fixes bug 32639; bugfix on + 0.3.2.1-alpha. Patch by Neel Chauhan. + + o Minor bugfixes (pluggable transports): + - When receiving a message on standard error from a pluggable + transport, log it at info level, rather than as a warning. Fixes + bug 33005; bugfix on 0.4.0.1-alpha. + + o Minor bugfixes (rust, build): + - Fix a syntax warning given by newer versions of Rust that was + creating problems for our continuous integration. Fixes bug 33212; + bugfix on 0.3.5.1-alpha. + + o Minor bugfixes (scripts): + - Fix update_versions.py for out-of-tree builds. Fixes bug 32371; + bugfix on 0.4.0.1-alpha. + + o Minor bugfixes (testing): + - Use the same code to find the tor binary in all of our test + scripts. This change makes sure we are always using the coverage + binary when coverage is enabled. Fixes bug 32368; bugfix + on 0.2.7.3-rc. + - Stop ignoring "tor --dump-config" errors in test_parseconf.sh. + Fixes bug 32468; bugfix on 0.4.2.1-alpha. + - Our option-validation tests no longer depend on specially + configured non-default, non-passing sets of options. Previously, + the tests had been written to assume that options would _not_ be + set to their defaults, which led to needless complexity and + verbosity. Fixes bug 32175; bugfix on 0.2.8.1-alpha. + + o Minor bugfixes (TLS bug handling): + - When encountering a bug in buf_read_from_tls(), return a "MISC" + error code rather than "WANTWRITE". This change might help avoid + some CPU-wasting loops if the bug is ever triggered. Bug reported + by opara. Fixes bug 32673; bugfix on 0.3.0.4-alpha. + + o Deprecated features: + - Deprecate the ClientAutoIPv6ORPort option. This option was not + true "Happy Eyeballs", and often failed on connections that + weren't reliably dual-stack. Closes ticket 32942. Patch by + Neel Chauhan. + + o Documentation: + - Provide a quickstart guide for a Circuit Padding Framework, and + documentation for researchers to implement and study circuit + padding machines. Closes ticket 28804. + - Add documentation in 'HelpfulTools.md' to describe how to build a + tag file. Closes ticket 32779. + - Create a high-level description of the long-term software + architecture goals. Closes ticket 32206. + - Describe the --dump-config command in the manual page. Closes + ticket 32467. + - Unite coding advice from this_not_that.md in torguts repo into our + coding standards document. Resolves ticket 31853. + + o Removed features: + - Our Doxygen configuration no longer generates LaTeX output. The + reference manual produced by doing this was over 4000 pages long, + and generally unusable. Closes ticket 32099. + - The option "TestingEstimatedDescriptorPropagationTime" is now + marked as obsolete. It has had no effect since 0.3.0.7, when + clients stopped rejecting consensuses "from the future". Closes + ticket 32807. + - We no longer support consensus methods before method 28; these + methods were only used by authorities running versions of Tor that + are now at end-of-life. In effect, this means that clients, + relays, and authorities now assume that authorities will be + running version 0.3.5.x or later. Closes ticket 32695. + + o Testing: + - Avoid conflicts between the fake sockets in tor's unit tests, and + real file descriptors. Resolves issues running unit tests with + GitHub Actions, where the process that embeds or launches the + tests has already opened a large number of file descriptors. Fixes + bug 33782; bugfix on 0.2.8.1-alpha. Found and fixed by + Putta Khunchalee. + - Add more test cases for tor's UTF-8 validation function. Also, + check the arguments passed to the function for consistency. Closes + ticket 32845. + - Improve test coverage for relay and dirauth config code, focusing + on option validation and normalization. Closes ticket 32213. + - Improve the consistency of test_parseconf.sh output, and run all + the tests, even if one fails. Closes ticket 32213. + - Run the practracker unit tests in the pre-commit git hook. Closes + ticket 32609. + + o Code simplification and refactoring (channel): + - Channel layer had a variable length cell handler that was not used + and thus removed. Closes ticket 32892. + + o Code simplification and refactoring (configuration): + - Immutability is now implemented as a flag on individual + configuration options rather than as part of the option-transition + checking code. Closes ticket 32344. + - Instead of keeping a list of configuration options to check for + relative paths, check all the options whose type is "FILENAME". + Solves part of ticket 32339. + - Our default log (which ordinarily sends NOTICE-level messages to + standard output) is now handled in a more logical manner. + Previously, we replaced the configured log options if they were + empty. Now, we interpret an empty set of log options as meaning + "use the default log". Closes ticket 31999. + - Remove some unused arguments from the options_validate() function, + to simplify our code and tests. Closes ticket 32187. + - Simplify the options_validate() code so that it looks at the + default options directly, rather than taking default options as an + argument. This change lets us simplify its interface. Closes + ticket 32185. + - Use our new configuration architecture to move most authority- + related options to the directory authority module. Closes + ticket 32806. + - When parsing the command line, handle options that determine our + "quiet level" and our mode of operation (e.g., --dump-config and + so on) all in one table. Closes ticket 32003. + + o Code simplification and refactoring (controller): + - Create a new abstraction for formatting control protocol reply + lines based on key-value pairs. Refactor some existing control + protocol code to take advantage of this. Closes ticket 30984. + - Create a helper function that can fetch network status or + microdesc consensuses. Closes ticket 31684. + + o Code simplification and refactoring (dirauth modularization): + - Remove the last remaining HAVE_MODULE_DIRAUTH inside a function. + Closes ticket 32163. + - Replace some confusing identifiers in process_descs.c. Closes + ticket 29826. + - Simplify some relay and dirauth config code. Closes ticket 32213. + + o Code simplification and refactoring (mainloop): + - Simplify the ip_address_changed() function by removing redundant + checks. Closes ticket 33091. + + o Code simplification and refactoring (misc): + - Make all the structs we declare follow the same naming convention + of ending with "_t". Closes ticket 32415. + - Move and rename some configuration-related code for clarity. + Closes ticket 32304. + - Our include.am files are now broken up by subdirectory. + Previously, src/core/include.am covered all of the subdirectories + in "core", "feature", and "app". Closes ticket 32137. + - Remove underused NS*() macros from test code: they make our tests + more confusing, especially for code-formatting tools. Closes + ticket 32887. + + o Code simplification and refactoring (relay modularization): + - Disable relay_periodic when the relay module is disabled. Closes + ticket 32244. + - Disable relay_sys when the relay module is disabled. Closes + ticket 32245. + + o Code simplification and refactoring (tool support): + - Add numerous missing dependencies to our include files, so that + they can be included in different reasonable orders and still + compile. Addresses part of ticket 32764. + - Fix some parts of our code that were difficult for Coccinelle to + parse. Related to ticket 31705. + - Fix some small issues in our code that prevented automatic + formatting tools from working. Addresses part of ticket 32764. + + o Documentation (manpage): + - Alphabetize the Server and Directory server sections of the tor + manpage. Also split Statistics options into their own section of + the manpage. Closes ticket 33188. Work by Swati Thacker as part of + Google Season of Docs. + - Document the __OwningControllerProcess torrc option and specify + its polling interval. Resolves issue 32971. + - Split "Circuit Timeout" options and "Node Selection" options into + their own sections of the tor manpage. Closes tickets 32928 and + 32929. Work by Swati Thacker as part of Google Season of Docs. + - Alphabetize the Client Options section of the tor manpage. Closes + ticket 32846. + - Alphabetize the General Options section of the tor manpage. Closes + ticket 32708. + - In the tor(1) manpage, reword and improve formatting of the + COMMAND-LINE OPTIONS and DESCRIPTION sections. Closes ticket + 32277. Based on work by Swati Thacker as part of Google Season + of Docs. + - In the tor(1) manpage, reword and improve formatting of the FILES, + SEE ALSO, and BUGS sections. Closes ticket 32176. Based on work by + Swati Thacker as part of Google Season of Docs. + + o Testing (Appveyor CI): + - In our Appveyor Windows CI, copy required DLLs to test and app + directories, before running tor's tests. This ensures that tor.exe + and test*.exe use the correct version of each DLL. This fix is not + required, but we hope it will avoid DLL search issues in future. + Fixes bug 33673; bugfix on 0.3.4.2-alpha. + - On Appveyor, skip the crypto/openssl_version test, which is + failing because of a mismatched library installation. Fix + for 33643. + + o Testing (circuit, EWMA): + - Add unit tests for circuitmux and EWMA subsystems. Closes + ticket 32196. + + o Testing (Travis CI): + - Remove a redundant distcheck job. Closes ticket 33194. + - Sort the Travis jobs in order of speed: putting the slowest jobs + first takes full advantage of Travis job concurrency. Closes + ticket 33194. + - Stop allowing the Chutney IPv6 Travis job to fail. This job was + previously configured to fast_finish (which requires + allow_failure), to speed up the build. Closes ticket 33195. + - When a Travis chutney job fails, use chutney's new "diagnostics.sh" + tool to produce detailed diagnostic output. Closes ticket 32792. + + Changes in version 0.4.2.7 - 2020-03-18 This is the third stable release in the 0.4.2.x series. It backports numerous fixes from later releases, including a fix for TROVE-2020-

1 0

[tor/master] Remove AssumeReachable from TestingTorNetwork.
by nickm＠torproject.org 15 Jun '20

15 Jun '20

commit 9fdaede3f70489398cd2dc276c961bc9d5c8f691 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 15 14:08:42 2020 -0400 Remove AssumeReachable from TestingTorNetwork. Closes ticket 34446. --- changes/ticket34446 | 5 +++++ doc/tor.1.txt | 1 - src/app/config/testnet.inc | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/ticket34446 b/changes/ticket34446 new file mode 100644 index 000000000..2ec772312 --- /dev/null +++ b/changes/ticket34446 @@ -0,0 +1,5 @@ + o Minor features (testing configuration): + - The TestingTorNetwork no longer implicitly sets AssumeReachable to 1. + This change will allow us to test relays' self-testing mechanisms, + and eventually to test authorities' relay-testing functionality. + Closes ticket 34446. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index f9e381265..15d5775e2 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -3359,7 +3359,6 @@ The following options are used for running a testing Tor network. DirAllowPrivateAddresses 1 EnforceDistinctSubnets 0 - AssumeReachable 1 AuthDirMaxServersPerAddr 0 ClientBootstrapConsensusAuthorityDownloadInitialDelay 0 ClientBootstrapConsensusFallbackDownloadInitialDelay 0 diff --git a/src/app/config/testnet.inc b/src/app/config/testnet.inc index 907c35f97..605943d80 100644 --- a/src/app/config/testnet.inc +++ b/src/app/config/testnet.inc @@ -2,7 +2,6 @@ // for 'TestingTorNetwork' in 'doc/tor.1.txt' { "DirAllowPrivateAddresses", "1" }, { "EnforceDistinctSubnets", "0" }, -{ "AssumeReachable", "1" }, { "AuthDirMaxServersPerAddr", "0" }, { "ClientBootstrapConsensusAuthorityDownloadInitialDelay", "0" }, { "ClientBootstrapConsensusFallbackDownloadInitialDelay", "0" },

1 0

[chutney/master] Remove all unused chutney templates and include files.
by nickm＠torproject.org 15 Jun '20

15 Jun '20

commit 052a9dc07aa9284b2f170c141adff47e2c4afad5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 15 10:59:06 2020 -0400 Remove all unused chutney templates and include files. Out of the 68 files in the torrc_templates directory, only 32 are used by Tor or Chutney for testing. I'm removing the extraneous ones in order to reduce our maintenance burden. We can restore any of these that I was wrong about. --- torrc_templates/authority-bwfile.tmpl | 2 -- torrc_templates/authority-exit.tmpl | 2 -- torrc_templates/authority-orport-v6-exit.tmpl | 7 ------- torrc_templates/bridge-obfs2.tmpl | 6 ------ torrc_templates/bridge-obfs4.tmpl | 6 ------ torrc_templates/bridgeauthority-exit.tmpl | 2 -- torrc_templates/bridgeclient-obfs2.tmpl | 3 --- torrc_templates/bridgeclient-obfs4.tmpl | 3 --- torrc_templates/client-only-v6.i | 6 ------ torrc_templates/client-only-v6.tmpl | 2 -- torrc_templates/client-use-v6.i | 3 --- torrc_templates/client-use-v6.tmpl | 2 -- torrc_templates/hs-only-v6.tmpl | 3 --- torrc_templates/hs-use-v6.tmpl | 3 --- torrc_templates/hs-v3-10.tmpl | 2 -- torrc_templates/hs-v3-only-v6.tmpl | 3 --- torrc_templates/hs-v3-use-v6.tmpl | 3 --- torrc_templates/hs0.tmpl | 2 -- torrc_templates/hs1.tmpl | 2 -- torrc_templates/hs10.tmpl | 2 -- torrc_templates/hs2.tmpl | 2 -- torrc_templates/hs3.tmpl | 2 -- torrc_templates/hs4.tmpl | 2 -- torrc_templates/hs5.tmpl | 2 -- torrc_templates/hs6.tmpl | 2 -- torrc_templates/hs7.tmpl | 2 -- torrc_templates/hs8.tmpl | 2 -- torrc_templates/hs9.tmpl | 2 -- torrc_templates/relay-exit-v4-only.tmpl | 6 ------ torrc_templates/relay-orport-v6-exit.tmpl | 10 ---------- torrc_templates/single-onion-indirect.tmpl | 6 ------ torrc_templates/single-onion-only-v6.tmpl | 3 --- torrc_templates/single-onion-use-v6.tmpl | 3 --- torrc_templates/single-onion-v3-indirect.tmpl | 6 ------ torrc_templates/single-onion-v3-only-v6.tmpl | 3 --- torrc_templates/single-onion-v3-use-v6.tmpl | 3 --- 36 files changed, 120 deletions(-) diff --git a/torrc_templates/authority-bwfile.tmpl b/torrc_templates/authority-bwfile.tmpl deleted file mode 100644 index 1411773..0000000 --- a/torrc_templates/authority-bwfile.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:authority.tmpl} -V3BandwidthsFile /tmp/bwfile diff --git a/torrc_templates/authority-exit.tmpl b/torrc_templates/authority-exit.tmpl deleted file mode 100644 index 6826845..0000000 --- a/torrc_templates/authority-exit.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:relay.tmpl} -${include:authority.i} diff --git a/torrc_templates/authority-orport-v6-exit.tmpl b/torrc_templates/authority-orport-v6-exit.tmpl deleted file mode 100644 index 326315b..0000000 --- a/torrc_templates/authority-orport-v6-exit.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -${include:authority-orport-v6.tmpl} - -# An authority that's also an exit relay that can exit to IPv4 & IPv6 localhost -# (newer versions of tor need this to be explicitly configured) - -${include:exit-v4.i} -${include:exit-v6.i} diff --git a/torrc_templates/bridge-obfs2.tmpl b/torrc_templates/bridge-obfs2.tmpl deleted file mode 100644 index 80baf2c..0000000 --- a/torrc_templates/bridge-obfs2.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -${include:bridge.tmpl} - -ServerTransportPlugin obfs2 exec ${path:obfs4proxy} -ExtOrPort $extorport -ServerTransportListenAddr obfs2 ${ip}:${ptport} - diff --git a/torrc_templates/bridge-obfs4.tmpl b/torrc_templates/bridge-obfs4.tmpl deleted file mode 100644 index e9b40bf..0000000 --- a/torrc_templates/bridge-obfs4.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -${include:bridge.tmpl} - -ServerTransportPlugin obfs4 exec ${path:obfs4proxy} -ExtOrPort $extorport -ServerTransportListenAddr obfs4 ${ip}:${ptport} - diff --git a/torrc_templates/bridgeauthority-exit.tmpl b/torrc_templates/bridgeauthority-exit.tmpl deleted file mode 100644 index 5837657..0000000 --- a/torrc_templates/bridgeauthority-exit.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:relay.tmpl} -${include:bridgeauthority.i} diff --git a/torrc_templates/bridgeclient-obfs2.tmpl b/torrc_templates/bridgeclient-obfs2.tmpl deleted file mode 100644 index 37513bb..0000000 --- a/torrc_templates/bridgeclient-obfs2.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -${include:bridgeclient.tmpl} - -ClientTransportPlugin obfs2 exec ${path:obfs4proxy} diff --git a/torrc_templates/bridgeclient-obfs4.tmpl b/torrc_templates/bridgeclient-obfs4.tmpl deleted file mode 100644 index 403d2f6..0000000 --- a/torrc_templates/bridgeclient-obfs4.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -${include:bridgeclient.tmpl} - -ClientTransportPlugin obfs4 exec ${path:obfs4proxy} diff --git a/torrc_templates/client-only-v6.i b/torrc_templates/client-only-v6.i deleted file mode 100644 index 985f237..0000000 --- a/torrc_templates/client-only-v6.i +++ /dev/null @@ -1,6 +0,0 @@ -# A client that only uses IPv6 ORPorts -${include:client-only-v6-md.i} - -# Due to Tor bug #19608, microdescriptors can't be used by IPv6-only clients -# running tor 0.2.9 and earlier -UseMicrodescriptors 0 diff --git a/torrc_templates/client-only-v6.tmpl b/torrc_templates/client-only-v6.tmpl deleted file mode 100644 index 79bd74b..0000000 --- a/torrc_templates/client-only-v6.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:client.tmpl} -${include:client-only-v6.i} diff --git a/torrc_templates/client-use-v6.i b/torrc_templates/client-use-v6.i deleted file mode 100644 index 8fff310..0000000 --- a/torrc_templates/client-use-v6.i +++ /dev/null @@ -1,3 +0,0 @@ -# A client that uses and prefers IPv6 -ClientUseIPv6 1 -ClientPreferIPv6ORPort 1 diff --git a/torrc_templates/client-use-v6.tmpl b/torrc_templates/client-use-v6.tmpl deleted file mode 100644 index 1659a39..0000000 --- a/torrc_templates/client-use-v6.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:client.tmpl} -${include:client-use-v6.i} diff --git a/torrc_templates/hs-only-v6.tmpl b/torrc_templates/hs-only-v6.tmpl deleted file mode 100644 index d487e8c..0000000 --- a/torrc_templates/hs-only-v6.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -${include:hs.tmpl} -# Hidden services are just another kind of client -${include:client-only-v6.i} diff --git a/torrc_templates/hs-use-v6.tmpl b/torrc_templates/hs-use-v6.tmpl deleted file mode 100644 index b3ff7a7..0000000 --- a/torrc_templates/hs-use-v6.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -${include:hs.tmpl} -# Hidden services are just another kind of client -${include:client-use-v6.i} diff --git a/torrc_templates/hs-v3-10.tmpl b/torrc_templates/hs-v3-10.tmpl deleted file mode 100644 index 0be6ef1..0000000 --- a/torrc_templates/hs-v3-10.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs-v3.tmpl} -HiddenServiceNumIntroductionPoints 10 diff --git a/torrc_templates/hs-v3-only-v6.tmpl b/torrc_templates/hs-v3-only-v6.tmpl deleted file mode 100644 index 0ff8759..0000000 --- a/torrc_templates/hs-v3-only-v6.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -${include:hs-v3.tmpl} -# Hidden services are just another kind of client -${include:client-only-v6.i} diff --git a/torrc_templates/hs-v3-use-v6.tmpl b/torrc_templates/hs-v3-use-v6.tmpl deleted file mode 100644 index 51e3700..0000000 --- a/torrc_templates/hs-v3-use-v6.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -${include:hs-v3.tmpl} -# Hidden services are just another kind of client -${include:client-use-v6.i} diff --git a/torrc_templates/hs0.tmpl b/torrc_templates/hs0.tmpl deleted file mode 100644 index bb5a9b5..0000000 --- a/torrc_templates/hs0.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 0 diff --git a/torrc_templates/hs1.tmpl b/torrc_templates/hs1.tmpl deleted file mode 100644 index 47948a9..0000000 --- a/torrc_templates/hs1.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 1 diff --git a/torrc_templates/hs10.tmpl b/torrc_templates/hs10.tmpl deleted file mode 100644 index e8758e6..0000000 --- a/torrc_templates/hs10.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 10 diff --git a/torrc_templates/hs2.tmpl b/torrc_templates/hs2.tmpl deleted file mode 100644 index b98cd39..0000000 --- a/torrc_templates/hs2.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 2 diff --git a/torrc_templates/hs3.tmpl b/torrc_templates/hs3.tmpl deleted file mode 100644 index a1dd6a4..0000000 --- a/torrc_templates/hs3.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 3 diff --git a/torrc_templates/hs4.tmpl b/torrc_templates/hs4.tmpl deleted file mode 100644 index 13d0aa4..0000000 --- a/torrc_templates/hs4.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 4 diff --git a/torrc_templates/hs5.tmpl b/torrc_templates/hs5.tmpl deleted file mode 100644 index 6d7544c..0000000 --- a/torrc_templates/hs5.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 5 diff --git a/torrc_templates/hs6.tmpl b/torrc_templates/hs6.tmpl deleted file mode 100644 index 8e3eff3..0000000 --- a/torrc_templates/hs6.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 6 diff --git a/torrc_templates/hs7.tmpl b/torrc_templates/hs7.tmpl deleted file mode 100644 index 7a57c4f..0000000 --- a/torrc_templates/hs7.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 7 diff --git a/torrc_templates/hs8.tmpl b/torrc_templates/hs8.tmpl deleted file mode 100644 index ce3c160..0000000 --- a/torrc_templates/hs8.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 8 diff --git a/torrc_templates/hs9.tmpl b/torrc_templates/hs9.tmpl deleted file mode 100644 index f287b13..0000000 --- a/torrc_templates/hs9.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 9 diff --git a/torrc_templates/relay-exit-v4-only.tmpl b/torrc_templates/relay-exit-v4-only.tmpl deleted file mode 100644 index ada1ca5..0000000 --- a/torrc_templates/relay-exit-v4-only.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -${include:relay-non-exit.tmpl} - -# An exit relay that can exit to IPv4 localhost only -# (newer versions of tor need this to be explicitly configured) - -${include:exit-v4.i} diff --git a/torrc_templates/relay-orport-v6-exit.tmpl b/torrc_templates/relay-orport-v6-exit.tmpl deleted file mode 100644 index 548c54f..0000000 --- a/torrc_templates/relay-orport-v6-exit.tmpl +++ /dev/null @@ -1,10 +0,0 @@ -${include:relay.tmpl} - -# A relay that has an IPv6 ORPort -${include:orport-v6.i} - -# An exit relay that can exit to IPv4 & IPv6 localhost -# (newer versions of tor need this to be explicitly configured) - -${include:exit-v4.i} -${include:exit-v6.i} diff --git a/torrc_templates/single-onion-indirect.tmpl b/torrc_templates/single-onion-indirect.tmpl deleted file mode 100644 index 58d812b..0000000 --- a/torrc_templates/single-onion-indirect.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -${include:single-onion.tmpl} - -# Only allow direct connections to the first directory authority's ORPort -# This checks that a single onion service makes 3-hop connections to -# unreachable intro points and rend points -ReachableAddresses 127.0.0.1:5000 diff --git a/torrc_templates/single-onion-only-v6.tmpl b/torrc_templates/single-onion-only-v6.tmpl deleted file mode 100644 index 8c72612..0000000 --- a/torrc_templates/single-onion-only-v6.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -${include:single-onion.tmpl} -# Onion services are just another kind of client -${include:client-only-v6.i} diff --git a/torrc_templates/single-onion-use-v6.tmpl b/torrc_templates/single-onion-use-v6.tmpl deleted file mode 100644 index d2db003..0000000 --- a/torrc_templates/single-onion-use-v6.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -${include:single-onion.tmpl} -# Onion services are just another kind of client -${include:client-use-v6.i} diff --git a/torrc_templates/single-onion-v3-indirect.tmpl b/torrc_templates/single-onion-v3-indirect.tmpl deleted file mode 100644 index 8cf6cd6..0000000 --- a/torrc_templates/single-onion-v3-indirect.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -${include:single-onion-v3.tmpl} - -# Only allow direct connections to the first directory authority's ORPort -# This checks that a single onion service makes 3-hop connections to -# unreachable intro points and rend points -ReachableAddresses 127.0.0.1:5000 diff --git a/torrc_templates/single-onion-v3-only-v6.tmpl b/torrc_templates/single-onion-v3-only-v6.tmpl deleted file mode 100644 index 7427cd7..0000000 --- a/torrc_templates/single-onion-v3-only-v6.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -${include:single-onion-v3.tmpl} -# Onion services are just another kind of client -${include:client-only-v6.i} diff --git a/torrc_templates/single-onion-v3-use-v6.tmpl b/torrc_templates/single-onion-v3-use-v6.tmpl deleted file mode 100644 index 25a6636..0000000 --- a/torrc_templates/single-onion-v3-use-v6.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -${include:single-onion-v3.tmpl} -# Onion services are just another kind of client -${include:client-use-v6.i}

1 0

[chutney/master] Remove all unused chutney networks.
by nickm＠torproject.org 15 Jun '20

15 Jun '20

commit f927505344ab392e90ce48df32fdb43185b3ea94 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 15 10:59:06 2020 -0400 Remove all unused chutney networks. Out of the 66 networks in the networks directory, only 13 are used by Tor or Chutney for testing. I'm removing most of extraneous ones in order to reduce our maintenance burden. I'm keeping these on request from dgoulet: basic hs-ob-v3 hs-v3 hs-v3-ipv6 We can restore any of these that I was wrong about. --- networks/basic-025 | 8 ----- networks/basic-100 | 10 ------ networks/basic-min-mixed | 47 --------------------------- networks/bridges | 14 -------- networks/bridges+hs | 19 ----------- networks/bridges+hs-v2 | 19 ----------- networks/bridges+ipv6 | 21 ------------ networks/bridges+ipv6+hs | 24 -------------- networks/bridges+ipv6+hs-v2 | 24 -------------- networks/bridges+ipv6+hs-v23 | 25 -------------- networks/bridges-obfs2 | 15 --------- networks/bridges-obfs4 | 39 ---------------------- networks/bwfile | 9 ------ networks/bwscanner | 10 ------ networks/client-ipv6-only | 22 ------------- networks/client-ipv6-only-md | 22 ------------- networks/hs | 11 ------- networks/hs-025 | 10 ------ networks/hs-100 | 12 ------- networks/hs-100-clients | 13 -------- networks/hs-client-ipv6 | 25 -------------- networks/hs-client-ipv6-md | 25 -------------- networks/hs-exit-min | 11 ------- networks/hs-intro | 39 ---------------------- networks/hs-ipv6 | 26 --------------- networks/hs-ipv6-md | 26 --------------- networks/hs-min | 17 ---------- networks/hs-min-mixed | 61 ----------------------------------- networks/hs-single-onion-v23-exit-min | 19 ----------- networks/hs-v23-exit-min | 15 --------- networks/hs-v23-ipv6 | 27 ---------------- networks/hs-v3-intro | 18 ----------- networks/hs-v3-ipv6-md | 26 --------------- networks/middle | 11 ------- networks/middle-025 | 11 ------- networks/middle-100 | 13 -------- networks/mixed | 16 --------- networks/mixed+hs-v2 | 22 ------------- networks/mixed+hs-v3 | 19 ----------- networks/single-onion | 17 ---------- networks/single-onion-client-ipv6 | 25 -------------- networks/single-onion-client-ipv6-md | 25 -------------- networks/single-onion-indirect | 20 ------------ networks/single-onion-ipv6 | 26 --------------- networks/single-onion-ipv6-md | 26 --------------- networks/single-onion-v23-ipv6 | 28 ---------------- networks/single-onion-v3 | 17 ---------- networks/single-onion-v3-ipv6 | 26 --------------- networks/single-onion-v3-ipv6-md | 26 --------------- 49 files changed, 1037 deletions(-) diff --git a/networks/basic-025 b/networks/basic-025 deleted file mode 100644 index 266643f..0000000 --- a/networks/basic-025 +++ /dev/null @@ -1,8 +0,0 @@ -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") - -NODES = Authority.getN(4) + ExitRelay.getN(16) + Client.getN(5) - -ConfigureNodes(NODES) diff --git a/networks/basic-100 b/networks/basic-100 deleted file mode 100644 index b1546e6..0000000 --- a/networks/basic-100 +++ /dev/null @@ -1,10 +0,0 @@ -# WARNING: This network can bring down a low-specced machine - -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") - -NODES = Authority.getN(5) + ExitRelay.getN(35) + Client.getN(60) - -ConfigureNodes(NODES) diff --git a/networks/basic-min-mixed b/networks/basic-min-mixed deleted file mode 100644 index 6f19c16..0000000 --- a/networks/basic-min-mixed +++ /dev/null @@ -1,47 +0,0 @@ -# This network generates a random mix of tor versions each time it is run -# You'll need at least 4 runs to cover all possibilities - -import random -rng = random.SystemRandom() - -# We have to use the same tags for old and new versions, otherwise switching -# between them at random does not work -OLD_TOR="tor-stable" - -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -OldAuthority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl", - tor=OLD_TOR) - -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -OldExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl", - tor=OLD_TOR) - -Client = Node(tag="c", client=1, torrc="client.tmpl") -OldClient = Node(tag="c", client=1, torrc="client.tmpl", tor=OLD_TOR) - -# Choose old or new Exit and Client at random -OldNewExitRelay = rng.choice([OldExitRelay, ExitRelay]) -OldNewClient = rng.choice([OldClient, Client]) - -def version(node): - if node._env["tor"] == Authority._env["tor"]: - return "new" - elif node._env["tor"] == OldAuthority._env["tor"]: - return "old" - else: - return "unk" - -# Every time chutney takes an action, it will pick versions at random -# It will likely choose different versions for each action -# This could be confusing, so log a message each time -print("Chose 1 %s authority, 1 %s authority, 1 %s exit and 1 %s client" - % (version(Authority), - version(OldAuthority), - version(OldNewExitRelay), - version(OldNewClient))) - -# The minimum number of authorities/relays/exits is 3, the minimum path length -NODES = Authority.getN(1) + OldAuthority.getN(1) + OldExitRelay.getN(1) + OldClient.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bridges b/networks/bridges deleted file mode 100644 index c5f6076..0000000 --- a/networks/bridges +++ /dev/null @@ -1,14 +0,0 @@ -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") - -BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, - relay=1, torrc="bridgeauthority.tmpl") -Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") -BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") - -NODES = Authority.getN(3) + BridgeAuthority.getN(1) + ExitRelay.getN(4) + \ - Bridge.getN(1) + Client.getN(1) + BridgeClient.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bridges+hs b/networks/bridges+hs deleted file mode 100644 index f240bcb..0000000 --- a/networks/bridges+hs +++ /dev/null @@ -1,19 +0,0 @@ -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") - -BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, - relay=1, torrc="bridgeauthority.tmpl") -Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") -BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -# We need 5 authorities/relays/exits to ensure we can build HS connections -NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ - ExitRelay.getN(4) + \ - Bridge.getN(1) + \ - Client.getN(1) + BridgeClient.getN(1) + \ - HS.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bridges+hs-v2 b/networks/bridges+hs-v2 deleted file mode 100644 index f240bcb..0000000 --- a/networks/bridges+hs-v2 +++ /dev/null @@ -1,19 +0,0 @@ -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") - -BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, - relay=1, torrc="bridgeauthority.tmpl") -Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") -BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -# We need 5 authorities/relays/exits to ensure we can build HS connections -NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ - ExitRelay.getN(4) + \ - Bridge.getN(1) + \ - Client.getN(1) + BridgeClient.getN(1) + \ - HS.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bridges+ipv6 b/networks/bridges+ipv6 deleted file mode 100644 index bda054b..0000000 --- a/networks/bridges+ipv6 +++ /dev/null @@ -1,21 +0,0 @@ -Require("IPV6") -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") - -BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, - relay=1, torrc="bridgeauthority.tmpl") -Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") -BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", torrc="bridge-v6.tmpl") -BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") - -# We put the IPv6 bridge first to ensure that clients try IPv6 before IPv4 -# Unfortunately, this does not prevent clients falling back to IPv4 -# bridges+ipv6-min only has IPv6 bridges -NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ - ExitRelay.getN(4) + \ - BridgeIPv6.getN(1) + Bridge.getN(1) + \ - Client.getN(1) + BridgeClient.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bridges+ipv6+hs b/networks/bridges+ipv6+hs deleted file mode 100644 index bf25fb0..0000000 --- a/networks/bridges+ipv6+hs +++ /dev/null @@ -1,24 +0,0 @@ -Require("IPV6") -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") - -BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, - relay=1, torrc="bridgeauthority.tmpl") -Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") -BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", torrc="bridge-v6.tmpl") -BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -# We need 5 authorities/relays/exits to ensure we can build HS connections -# We put the IPv6 bridge first to ensure that clients try IPv6 before IPv4 -# Unfortunately, this does not prevent clients falling back to IPv4 -# bridges+ipv6-min only has IPv6 bridges -NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ - ExitRelay.getN(4) + \ - BridgeIPv6.getN(1) + Bridge.getN(1) + \ - Client.getN(1) + BridgeClient.getN(1) + \ - HS.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bridges+ipv6+hs-v2 b/networks/bridges+ipv6+hs-v2 deleted file mode 100644 index 29f3e6f..0000000 --- a/networks/bridges+ipv6+hs-v2 +++ /dev/null @@ -1,24 +0,0 @@ -Require("IPV6") -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") - -BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, - relay=1, torrc="bridgeauthority.tmpl") -Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") -BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", torrc="bridge-v6.tmpl") -BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") -HSv2 = Node(tag="h", hs=1, torrc="hs-v2.tmpl") - -# We need 5 authorities/relays/exits to ensure we can build HS connections -# We put the IPv6 bridge first to ensure that clients try IPv6 before IPv4 -# Unfortunately, this does not prevent clients falling back to IPv4 -# bridges+ipv6-min only has IPv6 bridges -NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ - ExitRelay.getN(4) + \ - BridgeIPv6.getN(1) + Bridge.getN(1) + \ - Client.getN(1) + BridgeClient.getN(1) + \ - HSv2.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bridges+ipv6+hs-v23 b/networks/bridges+ipv6+hs-v23 deleted file mode 100644 index 977e93a..0000000 --- a/networks/bridges+ipv6+hs-v23 +++ /dev/null @@ -1,25 +0,0 @@ -Require("IPV6") -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") - -BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, - relay=1, torrc="bridgeauthority.tmpl") -Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") -BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", torrc="bridge-v6.tmpl") -BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") -HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") -HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") - -# We need 5 authorities/relays/exits to ensure we can build HS connections -# We put the IPv6 bridge first to ensure that clients try IPv6 before IPv4 -# Unfortunately, this does not prevent clients falling back to IPv4 -# bridges+ipv6-min only has IPv6 bridges -NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ - ExitRelay.getN(4) + \ - BridgeIPv6.getN(1) + Bridge.getN(1) + \ - Client.getN(1) + BridgeClient.getN(1) + \ - HSv2.getN(1) + HSv3.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bridges-obfs2 b/networks/bridges-obfs2 deleted file mode 100644 index 035be09..0000000 --- a/networks/bridges-obfs2 +++ /dev/null @@ -1,15 +0,0 @@ -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") - -BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, - relay=1, torrc="bridgeauthority.tmpl") -Bridge = Node(tag="br", bridge=1, pt_bridge=1, relay=1, pt_transport="obfs2", - torrc="bridge-obfs2.tmpl") -BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient-obfs2.tmpl") - -NODES = Authority.getN(3) + BridgeAuthority.getN(1) + ExitRelay.getN(4) + \ - Bridge.getN(1) + Client.getN(1) + BridgeClient.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bridges-obfs4 b/networks/bridges-obfs4 deleted file mode 100644 index b1ca6c4..0000000 --- a/networks/bridges-obfs4 +++ /dev/null @@ -1,39 +0,0 @@ -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") - -BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, - relay=1, torrc="bridgeauthority.tmpl") -Bridge = Node(tag="br", bridge=1, pt_bridge=1, relay=1, pt_transport="obfs4", - torrc="bridge-obfs4.tmpl") - -def obfs4_extra_args(env): - import os, re - # find the obfs4_bridgeline file. - location = os.path.join(env['dir'], - "pt_state", - "obfs4_bridgeline.txt") - if not os.path.exists(location): - return "" - # read the file and find the actual line - with open(location, 'r') as f: - for line in f: - if line.startswith("#"): - continue - if line.isspace(): - continue - m = re.match(r'(.*<FINGERPRINT>) (cert.*)', line) - if m: - return m.group(2) - return "" - -Bridge.set_runtime("pt_extra", obfs4_extra_args) - -BridgeClient = Node(tag="bc", client=1, bridgeclient=1, - torrc="bridgeclient-obfs4.tmpl", config_phase=2, launch_phase=2) - -NODES = Authority.getN(3) + BridgeAuthority.getN(1) + ExitRelay.getN(4) + \ - Bridge.getN(1) + Client.getN(1) + BridgeClient.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bwfile b/networks/bwfile deleted file mode 100644 index 43fdf19..0000000 --- a/networks/bwfile +++ /dev/null @@ -1,9 +0,0 @@ -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority-bwfile.tmpl") -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") - -# The minimum number of authorities/relays/exits is 3, the minimum path length -NODES = Authority.getN(2) + ExitRelay.getN(1) + Client.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bwscanner b/networks/bwscanner deleted file mode 100644 index 8ed1789..0000000 --- a/networks/bwscanner +++ /dev/null @@ -1,10 +0,0 @@ -# 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, torrc="relay-non-exit.tmpl") -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client_bwscanner.tmpl") - -NODES = Authority.getN(3) + \ - NonExitRelay.getN(21) + ExitRelay.getN(3) + Client.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/client-ipv6-only b/networks/client-ipv6-only deleted file mode 100644 index 5349c72..0000000 --- a/networks/client-ipv6-only +++ /dev/null @@ -1,22 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -ExitRelay6 = Node(tag="r", relay=1, exit=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="relay-orport-v6-exit.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# The minimum number of authorities/relays/exits is 3, the minimum path length -# But for some reason, Tor wants 4 "acceptable routers" (Tor bug #20071) -NODES = Authority6.getN(3) + ExitRelay6.getN(2) + HS.getN(1) + Client6.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/client-ipv6-only-md b/networks/client-ipv6-only-md deleted file mode 100644 index ff7a664..0000000 --- a/networks/client-ipv6-only-md +++ /dev/null @@ -1,22 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -ExitRelay6 = Node(tag="r", relay=1, exit=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="relay-orport-v6-exit.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# The minimum number of authorities/relays/exits is 3, the minimum path length -# But for some reason, Tor wants 4 "acceptable routers" (Tor bug #20071) -NODES = Authority6.getN(3) + ExitRelay6.getN(2) + HS.getN(1) + Client6.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs b/networks/hs deleted file mode 100644 index 2e27b76..0000000 --- a/networks/hs +++ /dev/null @@ -1,11 +0,0 @@ -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -# We need 5 authorities/relays/exits to ensure we can build HS connections -NODES = Authority.getN(3) + ExitRelay.getN(5) + \ - Client.getN(1) + HS.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-025 b/networks/hs-025 deleted file mode 100644 index ccdd321..0000000 --- a/networks/hs-025 +++ /dev/null @@ -1,10 +0,0 @@ -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -NODES = Authority.getN(4) + NonExitRelay.getN(10) + \ - Client.getN(6) + HS.getN(5) - -ConfigureNodes(NODES) diff --git a/networks/hs-100 b/networks/hs-100 deleted file mode 100644 index 2373e39..0000000 --- a/networks/hs-100 +++ /dev/null @@ -1,12 +0,0 @@ -# WARNING: This network can bring down a low-specced machine - -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -NODES = Authority.getN(5) + NonExitRelay.getN(25) + \ - Client.getN(10) + HS.getN(60) - -ConfigureNodes(NODES) diff --git a/networks/hs-100-clients b/networks/hs-100-clients deleted file mode 100644 index e61b42f..0000000 --- a/networks/hs-100-clients +++ /dev/null @@ -1,13 +0,0 @@ -# Each client sends to the hidden service simultaneously -# This requires the appropriate chutney arguments to make each client send data -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -# Well, 100 instances, with lots of clients -NODES = Authority.getN(3) + NonExitRelay.getN(10) + \ - Client.getN(86) + HS.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-client-ipv6 b/networks/hs-client-ipv6 deleted file mode 100644 index a89a04c..0000000 --- a/networks/hs-client-ipv6 +++ /dev/null @@ -1,25 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -NonExitRelay6 = Node(tag="r", relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="relay-orport-v6-non-exit.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client6.getN(1) + HS.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-client-ipv6-md b/networks/hs-client-ipv6-md deleted file mode 100644 index fb18e70..0000000 --- a/networks/hs-client-ipv6-md +++ /dev/null @@ -1,25 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -NonExitRelay6 = Node(tag="r", relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="relay-orport-v6-non-exit.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client6.getN(1) + HS.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-exit-min b/networks/hs-exit-min deleted file mode 100644 index 2d94d5b..0000000 --- a/networks/hs-exit-min +++ /dev/null @@ -1,11 +0,0 @@ -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -# We need 5 authorities/relays/exits to ensure we can build HS connections -NODES = Authority.getN(2) + ExitRelay.getN(3) + \ - Client.getN(1) + HS.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-intro b/networks/hs-intro deleted file mode 100644 index 3a21a7b..0000000 --- a/networks/hs-intro +++ /dev/null @@ -1,39 +0,0 @@ -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -HS0 = Node(tag="h", hs=1, torrc="hs0.tmpl") -HS1 = Node(tag="h", hs=1, torrc="hs1.tmpl") -HS2 = Node(tag="h", hs=1, torrc="hs2.tmpl") -HS3 = Node(tag="h", hs=1, torrc="hs3.tmpl") -HS4 = Node(tag="h", hs=1, torrc="hs4.tmpl") -HS5 = Node(tag="h", hs=1, torrc="hs5.tmpl") -HS6 = Node(tag="h", hs=1, torrc="hs6.tmpl") -HS7 = Node(tag="h", hs=1, torrc="hs7.tmpl") -HS8 = Node(tag="h", hs=1, torrc="hs8.tmpl") -HS9 = Node(tag="h", hs=1, torrc="hs9.tmpl") -HS10 = Node(tag="h", hs=1, torrc="hs10.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -# A hidden service with 10 intro points actually tries 12, then repurposes 2 -NODES = Authority.getN(2) + NonExitRelay.getN(10) + \ - Client.getN(1) + \ - HS0.getN(2) + \ - HS1.getN(2) + \ - HS2.getN(2) + \ - HS3.getN(2) + \ - HS4.getN(2) + \ - HS5.getN(2) + \ - HS6.getN(2) + \ - HS7.getN(2) + \ - HS8.getN(2) + \ - HS9.getN(2) + \ - HS10.getN(2) - -ConfigureNodes(NODES) diff --git a/networks/hs-ipv6 b/networks/hs-ipv6 deleted file mode 100644 index 815de7d..0000000 --- a/networks/hs-ipv6 +++ /dev/null @@ -1,26 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -NonExitRelay6 = Node(tag="r", relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="relay-orport-v6-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") -HS6 = Node(tag="h", hs=1, torrc="hs-only-v6.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client.getN(1) + Client6.getN(1) + HS6.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-ipv6-md b/networks/hs-ipv6-md deleted file mode 100644 index 82d3f48..0000000 --- a/networks/hs-ipv6-md +++ /dev/null @@ -1,26 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -NonExitRelay6 = Node(tag="r", relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="relay-orport-v6-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl") -HS6 = Node(tag="h", hs=1, torrc="hs-only-v6-md.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client.getN(1) + Client6.getN(1) + HS6.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-min b/networks/hs-min deleted file mode 100644 index 39dac23..0000000 --- a/networks/hs-min +++ /dev/null @@ -1,17 +0,0 @@ -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority.getN(2) + NonExitRelay.getN(3) + \ - Client.getN(1) + HS.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-min-mixed b/networks/hs-min-mixed deleted file mode 100644 index ebe3beb..0000000 --- a/networks/hs-min-mixed +++ /dev/null @@ -1,61 +0,0 @@ -# This network generates a random mix of tor versions each time it is run -# You'll need at least 8 runs to cover all possibilities - -import random -rng = random.SystemRandom() - -# We have to use the same tags for old and new versions, otherwise switching -# between them at random does not work -OLD_TOR="tor-stable" - -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -OldAuthority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl", - tor=OLD_TOR) - -NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -OldNonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl", - tor=OLD_TOR) - -Client = Node(tag="c", client=1, torrc="client.tmpl") -OldClient = Node(tag="c", client=1, torrc="client.tmpl", tor=OLD_TOR) - -HS = Node(tag="h", hs=1, torrc="hs.tmpl") -OldHS = Node(tag="h", hs=1, torrc="hs.tmpl", tor=OLD_TOR) - -# Choose old or new Relay, Client, and HS at random -OldNewNonExitRelay = rng.choice([OldNonExitRelay, NonExitRelay]) -OldNewClient = rng.choice([OldClient, Client]) -OldNewHS = rng.choice([OldHS, HS]) - -def version(node): - if node._env["tor"] == Authority._env["tor"]: - return "new" - elif node._env["tor"] == OldAuthority._env["tor"]: - return "old" - else: - return "unk" - -# Every time chutney takes an action, it will pick versions at random -# It will likely choose different versions for each action -# This could be confusing, so log a message each time -print(("Chose 1 %s authority, 1 %s authority, %d %s non-exit relay, " + - "%d %s non-exit relay, 1 %s client and 1 %s hidden service") - % (version(Authority), - version(OldAuthority), - 2 if OldNewNonExitRelay == NonExitRelay else 1, - version(NonExitRelay), - 2 if OldNewNonExitRelay == OldNonExitRelay else 1, - version(OldNonExitRelay), - version(OldNewClient), - version(OldNewHS))) - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority.getN(1) + OldAuthority.getN(1) + NonExitRelay.getN(1) + \ - OldNonExitRelay.getN(1) + OldNewNonExitRelay.getN(1) + \ - OldNewClient.getN(1) + OldNewHS.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-single-onion-v23-exit-min b/networks/hs-single-onion-v23-exit-min deleted file mode 100644 index 5f2d6f5..0000000 --- a/networks/hs-single-onion-v23-exit-min +++ /dev/null @@ -1,19 +0,0 @@ -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") -HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") -SingleOnionv2 = Node(tag="h", hs=1, torrc="single-onion.tmpl") -SingleOnionv3 = Node(tag="h", hs=1, torrc="single-onion-v3.tmpl") - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority.getN(2) + ExitRelay.getN(3) + \ - Client.getN(1) + \ - HSv2.getN(1) + HSv3.getN(1) + \ - SingleOnionv2.getN(1) + SingleOnionv3.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-v23-exit-min b/networks/hs-v23-exit-min deleted file mode 100644 index ec7d9ac..0000000 --- a/networks/hs-v23-exit-min +++ /dev/null @@ -1,15 +0,0 @@ -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") -HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority.getN(2) + ExitRelay.getN(3) + \ - Client.getN(1) + HSv2.getN(1) + HSv3.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-v23-ipv6 b/networks/hs-v23-ipv6 deleted file mode 100644 index 1d96ee9..0000000 --- a/networks/hs-v23-ipv6 +++ /dev/null @@ -1,27 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -NonExitRelay6 = Node(tag="r", relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="relay-orport-v6-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") -HSv2IPv6 = Node(tag="h", hs=1, torrc="hs-only-v6.tmpl") -HSv3IPv6 = Node(tag="h", hs=1, torrc="hs-v3-only-v6.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client.getN(1) + Client6.getN(1) + HSv2IPv6.getN(1) + HSv3IPv6.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-v3-intro b/networks/hs-v3-intro deleted file mode 100644 index a76858f..0000000 --- a/networks/hs-v3-intro +++ /dev/null @@ -1,18 +0,0 @@ -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -HS10 = Node(tag="h", hs=1, torrc="hs-v3-10.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -# A hidden service with 10 intro points actually tries 12, then repurposes 2 -NODES = Authority.getN(2) + NonExitRelay.getN(10) + \ - Client.getN(1) + HS10.getN(2) - -ConfigureNodes(NODES) diff --git a/networks/hs-v3-ipv6-md b/networks/hs-v3-ipv6-md deleted file mode 100644 index b02822e..0000000 --- a/networks/hs-v3-ipv6-md +++ /dev/null @@ -1,26 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -NonExitRelay6 = Node(tag="r", relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="relay-orport-v6-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl") -HS6 = Node(tag="h", hs=1, torrc="hs-v3-only-v6-md.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client.getN(1) + Client6.getN(1) + HS6.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/middle b/networks/middle deleted file mode 100644 index 10a1720..0000000 --- a/networks/middle +++ /dev/null @@ -1,11 +0,0 @@ -# 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, torrc="relay-non-exit.tmpl") -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") - -NODES = Authority.getN(3) + \ - NonExitRelay.getN(2) + ExitRelay.getN(3) + \ - Client.getN(2) - -ConfigureNodes(NODES) diff --git a/networks/middle-025 b/networks/middle-025 deleted file mode 100644 index ce02d27..0000000 --- a/networks/middle-025 +++ /dev/null @@ -1,11 +0,0 @@ -# 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, torrc="relay-non-exit.tmpl") -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") - -NODES = Authority.getN(4) + \ - NonExitRelay.getN(10) + ExitRelay.getN(6) + \ - Client.getN(5) - -ConfigureNodes(NODES) diff --git a/networks/middle-100 b/networks/middle-100 deleted file mode 100644 index 3046bb0..0000000 --- a/networks/middle-100 +++ /dev/null @@ -1,13 +0,0 @@ -# WARNING: This network can bring down a low-specced machine - -# 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, torrc="relay-non-exit.tmpl") -ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") - -NODES = Authority.getN(5) + \ - NonExitRelay.getN(25) + ExitRelay.getN(10) + \ - Client.getN(60) - -ConfigureNodes(NODES) diff --git a/networks/mixed b/networks/mixed deleted file mode 100644 index 488d91d..0000000 --- a/networks/mixed +++ /dev/null @@ -1,16 +0,0 @@ -OLD_TOR="tor-stable" -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -OldAuthority = Node(tag="aOLD", authority=1, relay=1, torrc="authority.tmpl", - tor=OLD_TOR) -Relay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -OldRelay = Node(tag="rOLD", relay=1, exit=1, torrc="relay.tmpl", - tor=OLD_TOR) -Client = Node(tag="c", client=1, torrc="client.tmpl") -OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR) - -NODES = Authority.getN(2) + OldAuthority.getN(2) + \ - Relay.getN(1) + OldRelay.getN(1) + \ - Client.getN(2) + OldClient.getN(2) - -ConfigureNodes(NODES) diff --git a/networks/mixed+hs-v2 b/networks/mixed+hs-v2 deleted file mode 100644 index e0dfa78..0000000 --- a/networks/mixed+hs-v2 +++ /dev/null @@ -1,22 +0,0 @@ -OLD_TOR="tor-stable" -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -OldAuthority = Node(tag="aOLD", authority=1, relay=1, torrc="authority.tmpl", - tor=OLD_TOR) -NonExitRelay = Node(tag="r", relay=1, torrc="relay.tmpl") -OldNonExitRelay = Node(tag="rOLD", relay=1, torrc="relay.tmpl", - tor=OLD_TOR) -Client = Node(tag="c", client=1, torrc="client.tmpl") -OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR) -HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") -OldHSv2 = Node(tag="hOLD", hs=1, torrc="hs.tmpl", tor=OLD_TOR) - -# Due to microdec download issues, tor 0.3.5 needs at least 5 -# authorities/relays/exits in the consensus. -# And for similar reasons, it needs non-exit relays in this network. -NODES = Authority.getN(2) + OldAuthority.getN(2) + \ - NonExitRelay.getN(1) + OldNonExitRelay.getN(1) + \ - Client.getN(1) + OldClient.getN(1) + \ - HSv2.getN(1) + OldHSv2.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/mixed+hs-v3 b/networks/mixed+hs-v3 deleted file mode 100644 index b1dcce7..0000000 --- a/networks/mixed+hs-v3 +++ /dev/null @@ -1,19 +0,0 @@ -OLD_TOR="tor-stable" -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -OldAuthority = Node(tag="aOLD", authority=1, relay=1, torrc="authority.tmpl", - tor=OLD_TOR) -Relay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -OldRelay = Node(tag="rOLD", relay=1, exit=1, torrc="relay.tmpl", - tor=OLD_TOR) -Client = Node(tag="c", client=1, torrc="client.tmpl") -OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR) -HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") -OldHSv3 = Node(tag="hOLD", hs=1, torrc="hs-v3.tmpl", tor=OLD_TOR) - -NODES = Authority.getN(2) + OldAuthority.getN(2) + \ - Relay.getN(1) + OldRelay.getN(1) + \ - Client.getN(1) + OldClient.getN(1) + \ - HSv3.getN(1) + OldHSv3.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/single-onion b/networks/single-onion deleted file mode 100644 index 36dad53..0000000 --- a/networks/single-onion +++ /dev/null @@ -1,17 +0,0 @@ -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -SingleOnion = Node(tag="h", hs=1, torrc="single-onion.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority.getN(2) + NonExitRelay.getN(3) + \ - Client.getN(1) + SingleOnion.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/single-onion-client-ipv6 b/networks/single-onion-client-ipv6 deleted file mode 100644 index 177974c..0000000 --- a/networks/single-onion-client-ipv6 +++ /dev/null @@ -1,25 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -NonExitRelay6 = Node(tag="r", relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="relay-orport-v6-non-exit.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") -SingleOnion = Node(tag="h", hs=1, torrc="single-onion.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client6.getN(1) + SingleOnion.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/single-onion-client-ipv6-md b/networks/single-onion-client-ipv6-md deleted file mode 100644 index 387567a..0000000 --- a/networks/single-onion-client-ipv6-md +++ /dev/null @@ -1,25 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -NonExitRelay6 = Node(tag="r", relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="relay-orport-v6-non-exit.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl") -SingleOnion = Node(tag="h", hs=1, torrc="single-onion.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client6.getN(1) + SingleOnion.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/single-onion-indirect b/networks/single-onion-indirect deleted file mode 100644 index 014e8bf..0000000 --- a/networks/single-onion-indirect +++ /dev/null @@ -1,20 +0,0 @@ -# Check that a single onion service makes 3-hop connections to -# unreachable intro points and rend points, by forcing it to connect -# through only one guard -# It should act exactly like a hidden service, except that it might make -# direct connections to that one guard if that guard is also intro or rend - -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -SingleOnionIndirect = Node(tag="h", hs=1, torrc="single-onion-indirect.tmpl") - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority.getN(2) + NonExitRelay.getN(3) + \ - Client.getN(1) + SingleOnionIndirect.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/single-onion-ipv6 b/networks/single-onion-ipv6 deleted file mode 100644 index 98f780c..0000000 --- a/networks/single-onion-ipv6 +++ /dev/null @@ -1,26 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -NonExitRelay6 = Node(tag="r", relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="relay-orport-v6-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") -SingleOnion6 = Node(tag="h", hs=1, torrc="single-onion-only-v6.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client.getN(1) + Client6.getN(1) + SingleOnion6.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/single-onion-ipv6-md b/networks/single-onion-ipv6-md deleted file mode 100644 index c71a6ab..0000000 --- a/networks/single-onion-ipv6-md +++ /dev/null @@ -1,26 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -NonExitRelay6 = Node(tag="r", relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="relay-orport-v6-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl") -SingleOnion6 = Node(tag="h", hs=1, torrc="single-onion-only-v6-md.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client.getN(1) + Client6.getN(1) + SingleOnion6.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/single-onion-v23-ipv6 b/networks/single-onion-v23-ipv6 deleted file mode 100644 index 84be7e1..0000000 --- a/networks/single-onion-v23-ipv6 +++ /dev/null @@ -1,28 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -NonExitRelay6 = Node(tag="r", relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="relay-orport-v6-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") -SingleOnionv2IPv6 = Node(tag="h", hs=1, torrc="single-onion-only-v6.tmpl") -SingleOnionv3IPv6 = Node(tag="h", hs=1, torrc="single-onion-v3-only-v6.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client.getN(1) + Client6.getN(1) + \ - SingleOnionv2IPv6.getN(1) + SingleOnionv3IPv6.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/single-onion-v3 b/networks/single-onion-v3 deleted file mode 100644 index 38d1a2a..0000000 --- a/networks/single-onion-v3 +++ /dev/null @@ -1,17 +0,0 @@ -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -SingleOnion = Node(tag="h", hs=1, torrc="single-onion-v3.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority.getN(2) + NonExitRelay.getN(3) + \ - Client.getN(1) + SingleOnion.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/single-onion-v3-ipv6 b/networks/single-onion-v3-ipv6 deleted file mode 100644 index b91f48f..0000000 --- a/networks/single-onion-v3-ipv6 +++ /dev/null @@ -1,26 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -NonExitRelay6 = Node(tag="r", relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="relay-orport-v6-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") -SingleOnionv3IPv6 = Node(tag="h", hs=1, torrc="single-onion-v3-only-v6.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client.getN(1) + Client6.getN(1) + SingleOnionv3IPv6.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/single-onion-v3-ipv6-md b/networks/single-onion-v3-ipv6-md deleted file mode 100644 index faa1527..0000000 --- a/networks/single-onion-v3-ipv6-md +++ /dev/null @@ -1,26 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -NonExitRelay6 = Node(tag="r", relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="relay-orport-v6-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl") -SingleOnionv3IPv6 = Node(tag="h", hs=1, torrc="single-onion-v3-only-v6-md.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client.getN(1) + Client6.getN(1) + SingleOnionv3IPv6.getN(1) - -ConfigureNodes(NODES)

1 0

[chutney/master] Merge branch 'ticket34447_v2'
by nickm＠torproject.org 15 Jun '20

15 Jun '20

1 0

[chutney/master] Make all networks have >=3 authorities.
by nickm＠torproject.org 15 Jun '20

15 Jun '20

commit 1e810b6dae86670fbdff2ef7d9a7a68b20c94abf Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 15 13:51:59 2020 -0400 Make all networks have >=3 authorities. When we fix #34446 in Tor, we will need to have at least three AssumeReachable relays on every network, or else Tor relays won't ever actually upload enough descriptors to build circuits, and so they won't upload their descriptors, and so on forever. --- networks/hs-v2-min | 5 ++++- networks/hs-v23-ipv6-md | 5 ++++- networks/hs-v23-min | 5 ++++- networks/hs-v3-min | 5 ++++- networks/mixed+hs-v23-ipv6 | 4 +++- networks/single-onion-v23 | 5 ++++- networks/single-onion-v23-ipv6-md | 5 ++++- 7 files changed, 27 insertions(+), 7 deletions(-) diff --git a/networks/hs-v2-min b/networks/hs-v2-min index e7eb52c..3f1cea8 100644 --- a/networks/hs-v2-min +++ b/networks/hs-v2-min @@ -16,7 +16,10 @@ HS = Node(tag="h", hs=1, torrc="hs.tmpl") # connections: # a minimum path length of 3, plus the client-nominated rendezvous point, # plus a seperate introduction point -NODES = Authority.getN(2) + NonExitRelay.getN(3) + \ +# +# (XXX We have temporarily added an extra authority to work around issue +# 34447.) +NODES = Authority.getN(3) + NonExitRelay.getN(3) + \ Client.getN(1) + HS.getN(1) ConfigureNodes(NODES) diff --git a/networks/hs-v23-ipv6-md b/networks/hs-v23-ipv6-md index ffe1b5b..2254309 100644 --- a/networks/hs-v23-ipv6-md +++ b/networks/hs-v23-ipv6-md @@ -26,7 +26,10 @@ HSv3IPv6 = Node(tag="h", hs=1, torrc="hs-v3-only-v6-md.tmpl") # connections: # a minimum path length of 3, plus the client-nominated rendezvous point, # plus a seperate introduction point -NODES = Authority6.getN(2) + \ +# +# (XXX We have temporarily added an extra authority to work around issue +# 34447.) +NODES = Authority6.getN(3) + \ NonExitRelay6.getN(3) + \ Client.getN(1) + Client6.getN(1) + \ HSv2IPv6.getN(1) + HSv3IPv6.getN(1) diff --git a/networks/hs-v23-min b/networks/hs-v23-min index 5c6ac8e..de0ff16 100644 --- a/networks/hs-v23-min +++ b/networks/hs-v23-min @@ -15,7 +15,10 @@ HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") # connections: # a minimum path length of 3, plus the client-nominated rendezvous point, # plus a seperate introduction point -NODES = Authority.getN(2) + NonExitRelay.getN(3) + \ +# +# (XXX We have temporarily added an extra authority to work around issue +# 34447.) +NODES = Authority.getN(3) + NonExitRelay.getN(3) + \ Client.getN(1) + HSv2.getN(1) + HSv3.getN(1) ConfigureNodes(NODES) diff --git a/networks/hs-v3-min b/networks/hs-v3-min index 56f15cb..e007f84 100644 --- a/networks/hs-v3-min +++ b/networks/hs-v3-min @@ -14,7 +14,10 @@ HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl") # connections: # a minimum path length of 3, plus the client-nominated rendezvous point, # plus a seperate introduction point -NODES = Authority.getN(2) + NonExitRelay.getN(3) + \ +# +# (XXX We have temporarily added an extra authority to work around issue +# 34447.) +NODES = Authority.getN(3) + NonExitRelay.getN(3) + \ Client.getN(1) + HS.getN(1) ConfigureNodes(NODES) diff --git a/networks/mixed+hs-v23-ipv6 b/networks/mixed+hs-v23-ipv6 index 250bde1..5d9e2e3 100644 --- a/networks/mixed+hs-v23-ipv6 +++ b/networks/mixed+hs-v23-ipv6 @@ -51,7 +51,9 @@ OldHSv3IPv6 = Node(tag="hOLD", hs=1, torrc="hs-v3-only-v6-md.tmpl", tor=OLD_TOR) -NODES = Authority6.getN(1) + OldAuthority6.getN(1) + \ +# (XXX We have temporarily added an extra authority to work around issue +# 34447.) +NODES = Authority6.getN(2) + OldAuthority6.getN(1) + \ NonExitRelay.getN(1) + OldNonExitRelay.getN(1) + \ NonExitRelay6.getN(1) + OldNonExitRelay6.getN(1) + \ Client6.getN(1) + OldClient6.getN(1) + \ diff --git a/networks/single-onion-v23 b/networks/single-onion-v23 index 7afd6b9..f22fec6 100644 --- a/networks/single-onion-v23 +++ b/networks/single-onion-v23 @@ -12,7 +12,10 @@ SingleOnionv3 = Node(tag="h", hs=1, torrc="single-onion-v3.tmpl") # connections: # a minimum path length of 3, plus the client-nominated rendezvous point, # plus a seperate introduction point -NODES = Authority.getN(2) + NonExitRelay.getN(3) + \ +# +# (XXX We have temporarily added an extra authority to work around issue +# 34447.) +NODES = Authority.getN(3) + NonExitRelay.getN(3) + \ Client.getN(1) + SingleOnionv2.getN(1) + SingleOnionv3.getN(1) ConfigureNodes(NODES) diff --git a/networks/single-onion-v23-ipv6-md b/networks/single-onion-v23-ipv6-md index bb76ed8..dff99ab 100644 --- a/networks/single-onion-v23-ipv6-md +++ b/networks/single-onion-v23-ipv6-md @@ -21,7 +21,10 @@ SingleOnionv3IPv6 = Node(tag="h", hs=1, torrc="single-onion-v3-only-v6-md.tmpl") # connections: # a minimum path length of 3, plus the client-nominated rendezvous point, # plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ +# +# (XXX We have temporarily added an extra authority to work around issue +# 34447.) +NODES = Authority6.getN(3) + NonExitRelay6.getN(3) + \ Client.getN(1) + Client6.getN(1) + \ SingleOnionv2IPv6.getN(1) + SingleOnionv3IPv6.getN(1)

1 0

[translation/torbutton-branddtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-branddtd
by translation＠torproject.org 15 Jun '20

15 Jun '20

commit e239f6ee0f9591da05ceb1cc809bc1778bbac6dc Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 15 17:51:23 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-branddtd --- nl/brand.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/brand.dtd b/nl/brand.dtd index b0585be725..97e127b0cd 100644 --- a/nl/brand.dtd +++ b/nl/brand.dtd @@ -10,7 +10,7 @@  -<!ENTITY brandProductName "Tor-browser"> +<!ENTITY brandProductName "Tor Browser">  <!ENTITY plugins.installed.find "Klik om de geïnstalleerde systeemplug-ins te laden">

1 0