- tor-commits - lists.torproject.org

[tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit 83f8fe05e8f398f8f1a403b159284db5952d17de Merge: 621f8ac418 ea5eebf431 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:53:31 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 Signed-off-by: David Goulet <dgoulet(a)torproject.org> changes/ticket40494 | 5 +++++ doc/man/tor.1.txt | 3 ++- src/feature/relay/relay_config.c | 13 ++++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --cc doc/man/tor.1.txt index 109e70f2ba,7c0071500e..0af9a9c03d --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@@ -2820,12 -2803,8 +2820,13 @@@ details. more than once, but only one advertised DirPort is supported: all but one DirPort must have the **NoAdvertise** flag set. (Default: 0) + + - The same flags are supported here as are supported by ORPort. + The same flags are supported here as are supported by ORPort. This port can + only be IPv4. + + + As of Tor 0.4.6.1-alpha, non-authoritative relays (see + AuthoritativeDirectory) will not publish the DirPort but will still listen + on it. Clients don't use the DirPorts on relays, so it is safe for you + to remove the DirPort from your torrc configuration. [[DirPortFrontPage]] **DirPortFrontPage** __FILENAME__:: When this option is set, it takes an HTML file and publishes it as "/" on

1 0

[tor/release-0.4.5] Merge branch 'tor-gitlab/mr/477' into maint-0.4.5
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit ea5eebf431c732b8f1c0e9daa9b7b716c48bc76f Merge: 1e3e921d7d 6e8e1a4e6f Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:52:03 2021 -0400 Merge branch 'tor-gitlab/mr/477' into maint-0.4.5 changes/ticket40494 | 5 +++++ doc/man/tor.1.txt | 3 ++- src/feature/relay/relay_config.c | 13 ++++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'tor-gitlab/mr/477' into maint-0.4.5
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit ea5eebf431c732b8f1c0e9daa9b7b716c48bc76f Merge: 1e3e921d7d 6e8e1a4e6f Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:52:03 2021 -0400 Merge branch 'tor-gitlab/mr/477' into maint-0.4.5 changes/ticket40494 | 5 +++++ doc/man/tor.1.txt | 3 ++- src/feature/relay/relay_config.c | 13 ++++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit ef08058927502aa6a31d9b7be20dca5f874a218b Merge: 6c1487c1be 33fb0f1d8f Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:54:14 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 scripts/ci/ci-driver.sh | 2 -- 1 file changed, 2 deletions(-)

1 0

[tor/release-0.4.6] relay: Don't allow DirPort on non-IPv4
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit 6e8e1a4e6ff249afd32e7851989ba3d79df9d5b2 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 2 09:34:03 2021 -0400 relay: Don't allow DirPort on non-IPv4 Our code doesn't allow it and so this prevents an assert() crash if the DirPort is for instance IPv6 only. Fixes #40494 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40494 | 5 +++++ doc/man/tor.1.txt | 3 ++- src/feature/relay/relay_config.c | 13 ++++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/changes/ticket40494 b/changes/ticket40494 new file mode 100644 index 0000000000..a0e6c38443 --- /dev/null +++ b/changes/ticket40494 @@ -0,0 +1,5 @@ + o Minor bugfixes (relay): + - Reject IPv6-only DirPorts. Our reachability self-test forces DirPorts to + be IPv4, but our configuration parser allowed them to be IPv6-only, + which led to an assertion failure. Fixes bug 40494; bugfix on + 0.4.5.1-alpha. diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index 209900832f..7c0071500e 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -2803,7 +2803,8 @@ details.) more than once, but only one advertised DirPort is supported: all but one DirPort must have the **NoAdvertise** flag set. (Default: 0) + + - The same flags are supported here as are supported by ORPort. + The same flags are supported here as are supported by ORPort. This port can + only be IPv4. [[DirPortFrontPage]] **DirPortFrontPage** __FILENAME__:: When this option is set, it takes an HTML file and publishes it as "/" on diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c index c4a5d7f572..8ea0ad8397 100644 --- a/src/feature/relay/relay_config.c +++ b/src/feature/relay/relay_config.c @@ -352,6 +352,7 @@ check_and_prune_server_ports(smartlist_t *ports, int n_orport_listeners = 0; int n_dirport_advertised = 0; int n_dirport_listeners = 0; + int n_dirport_listeners_v4 = 0; int n_low_port = 0; int r = 0; @@ -362,8 +363,12 @@ check_and_prune_server_ports(smartlist_t *ports, if (port->type == CONN_TYPE_DIR_LISTENER) { if (! port->server_cfg.no_advertise) ++n_dirport_advertised; - if (! port->server_cfg.no_listen) + if (! port->server_cfg.no_listen) { ++n_dirport_listeners; + if (port_binds_ipv4(port)) { + ++n_dirport_listeners_v4; + } + } } else if (port->type == CONN_TYPE_OR_LISTENER) { if (! port->server_cfg.no_advertise) { ++n_orport_advertised; @@ -408,6 +413,12 @@ check_and_prune_server_ports(smartlist_t *ports, "address. Tor needs to listen on an IPv4 address too."); r = -1; } + if (n_dirport_advertised && n_dirport_listeners_v4 == 0) { + log_warn(LD_CONFIG, "We are listening on a non-IPv4 DirPort. This is not " + "allowed. Consider either setting an IPv4 address or " + "simply removing it because it is not used anymore."); + r = -1; + } if (n_low_port && options->AccountingMax && (!have_capability_support() || options->KeepBindCapabilities == 0)) {

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit 6c1487c1be0a84ff0683f35043c2ea8621d54f1f Merge: f7c71dc53d 83f8fe05e8 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:53:35 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 changes/ticket40494 | 5 +++++ doc/man/tor.1.txt | 3 ++- src/feature/relay/relay_config.c | 13 ++++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit 83f8fe05e8f398f8f1a403b159284db5952d17de Merge: 621f8ac418 ea5eebf431 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:53:31 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 Signed-off-by: David Goulet <dgoulet(a)torproject.org> changes/ticket40494 | 5 +++++ doc/man/tor.1.txt | 3 ++- src/feature/relay/relay_config.c | 13 ++++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --cc doc/man/tor.1.txt index 109e70f2ba,7c0071500e..0af9a9c03d --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@@ -2820,12 -2803,8 +2820,13 @@@ details. more than once, but only one advertised DirPort is supported: all but one DirPort must have the **NoAdvertise** flag set. (Default: 0) + + - The same flags are supported here as are supported by ORPort. + The same flags are supported here as are supported by ORPort. This port can + only be IPv4. + + + As of Tor 0.4.6.1-alpha, non-authoritative relays (see + AuthoritativeDirectory) will not publish the DirPort but will still listen + on it. Clients don't use the DirPorts on relays, so it is safe for you + to remove the DirPort from your torrc configuration. [[DirPortFrontPage]] **DirPortFrontPage** __FILENAME__:: When this option is set, it takes an HTML file and publishes it as "/" on

1 0

[tor/release-0.4.6] shellcheck: Remove unused variable in ci-driver.sh
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit 33fb0f1d8f77759e27d9372194b826bc4ff3d7ff Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:50:43 2021 -0400 shellcheck: Remove unused variable in ci-driver.sh Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- scripts/ci/ci-driver.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 245922b631..a13e0f6c17 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -293,7 +293,6 @@ TOR_VERSION=$(grep -m 1 AC_INIT "${CI_SRCDIR}"/configure.ac | sed -e 's/.*\[//; # Tor version. Only create the variables we need. TOR_VER_AT_LEAST_043=no TOR_VER_AT_LEAST_044=no -TOR_VER_AT_LEAST_046=no # These are the currently supported Tor versions; no need to work with anything # ancient in this script. @@ -321,7 +320,6 @@ case "$TOR_VERSION" in 0.4.6.*) TOR_VER_AT_LEAST_043=yes TOR_VER_AT_LEAST_044=yes - TOR_VER_AT_LEAST_046=yes ;; esac

1 0

[tor/main] Merge branch 'maint-0.4.5' into maint-0.4.6
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit 621f8ac418e1441c9fe568b015058438daba6616 Merge: 9922116388 1e3e921d7d Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:47:43 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 doc/asciidoc-helper.sh | 5 +++-- scripts/ci/ci-driver.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)

1 0

[tor/main] shellcheck: Make it happy on couple scripts
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit 1902edaf52b66145b0222c6586c2acb9d71980f0 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:47:30 2021 -0400 shellcheck: Make it happy on couple scripts Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- doc/asciidoc-helper.sh | 9 +++++---- scripts/ci/ci-driver.sh | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/asciidoc-helper.sh b/doc/asciidoc-helper.sh index 2b63154441..3706ca2e14 100755 --- a/doc/asciidoc-helper.sh +++ b/doc/asciidoc-helper.sh @@ -12,7 +12,8 @@ if [ $# != 3 ]; then exit 1; fi -export SOURCE_DATE_EPOCH=$(git show --no-patch --format='%ct') +SOURCE_DATE_EPOCH="$(git show --no-patch --format='%ct')" +export SOURCE_DATE_EPOCH output=$3 @@ -21,7 +22,7 @@ if [ "$1" = "html" ]; then base=${output%%.html.in} if [ "$2" != none ]; then - TZ=UTC "$2" -f "$(dirname $0)/nofooter.conf" -d manpage -o "$output" "$input"; + TZ=UTC "$2" -f "$(dirname "$0")/nofooter.conf" -d manpage -o "$output" "$input"; else echo "=================================="; echo; @@ -46,8 +47,8 @@ elif [ "$1" = "man" ]; then echo "=================================="; exit 1; fi - if "$2" -f manpage $input; then - mv $base.1 $output; + if "$2" -f manpage "$input"; then + mv "$base.1" "$output"; else cat<<EOF ================================== diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index f99e45e6f2..61f97a91d4 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -287,7 +287,7 @@ fi ############################################################################# # Determine the version of Tor. -TOR_VERSION=$(grep -m 1 AC_INIT ${CI_SRCDIR}/configure.ac | sed -e 's/.*\[//; s/\].*//;') +TOR_VERSION=$(grep -m 1 AC_INIT "${CI_SRCDIR}"/configure.ac | sed -e 's/.*\[//; s/\].*//;') # Use variables like these when we need to behave differently depending on # Tor version. Only create the variables we need.

1 0