tor-commits August 2020

tor-commits@lists.torproject.org

18 participants
1961 discussions

[tor/release-0.4.4] Remove a BUG() that could normally trigger in edge-cases.
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 9316ca9f0606666b2188d5b11c969e01a587332c Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Aug 11 14:34:06 2020 +0300 Remove a BUG() that could normally trigger in edge-cases. --- changes/bug34086 | 3 +++ src/feature/hs/hs_client.c | 14 ++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/changes/bug34086 b/changes/bug34086 new file mode 100644 index 0000000000..245992f8f4 --- /dev/null +++ b/changes/bug34086 @@ -0,0 +1,3 @@ + o Minor bugfixes (onion service v3): + - Remove a BUG() warning that could trigger in certain unlikely edge-cases. + Fixes bug 34086; bugfix on 0.3.2.1-alpha. diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index 892f69a3a0..d9c5d8ca1d 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -778,10 +778,16 @@ client_rendezvous_circ_has_opened(origin_circuit_t *circ) * the v3 rendezvous protocol */ if (rp_ei) { const node_t *rp_node = node_get_by_id(rp_ei->identity_digest); - if (rp_node) { - if (BUG(!node_supports_v3_rendezvous_point(rp_node))) { - return; - } + if (rp_node && !node_supports_v3_rendezvous_point(rp_node)) { + /* Even tho we checked that this node supported v3 when we created the + rendezvous circuit, there is a chance that we might think it does + not support v3 anymore. This might happen if we got a new consensus + in the meanwhile, where the relay is still listed but its listed + descriptor digest has changed and hence we can't access its 'ri' or + 'md'. */ + log_info(LD_REND, "Rendezvous node %s did not support v3 after circuit " + "has opened.", safe_str_client(extend_info_describe(rp_ei))); + return; } }

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/119' into maint-0.4.4
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit d76f8457f305fd7445dc09131b418b1bfbd99988 Merge: 2b968446d9 9316ca9f06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:40:02 2020 -0400 Merge remote-tracking branch 'tor-gitlab/mr/119' into maint-0.4.4 changes/bug34086 | 3 +++ src/feature/hs/hs_client.c | 14 ++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-)

1 0

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

11 Aug '20

commit e93ff481f93e3d35d7cfbb4572dad76d8726c279 Merge: 11961f0bc5 d76f8457f3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:40:09 2020 -0400 Merge branch 'maint-0.4.4'

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 872d369ce7de08304f7eab841c5307173f891ec5 Merge: e3b501c576 d76f8457f3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:40:09 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug34086 | 3 +++ src/feature/hs/hs_client.c | 14 ++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.4] Merge remote-tracking branch 'tor-gitlab/mr/119' into maint-0.4.4
by nickm＠torproject.org 11 Aug '20

11 Aug '20

1 0

[tor/master] Remove a BUG() that could normally trigger in edge-cases.
by nickm＠torproject.org 11 Aug '20

11 Aug '20

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/119'
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 11961f0bc553a5909f2465a06fe5e7ca27fa6da9 Merge: da9684d89a 9316ca9f06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:39:30 2020 -0400 Merge remote-tracking branch 'tor-gitlab/mr/119' changes/bug34086 | 3 +++ src/feature/hs/hs_client.c | 14 ++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.4.4] CI: Only run doxygen on 0.4.3 and later.
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 9eb316de4295086d534a7576cc13606a42544c9f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:22:35 2020 -0400 CI: Only run doxygen on 0.4.3 and later. --- scripts/ci/ci-driver.sh | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index a675335115..20193e6b2a 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -267,6 +267,29 @@ if [[ "${CHUTNEY}" = "yes" ]]; then show_git_version Chutney "${CHUTNEY_PATH}" fi +############################################################################# +# Determine the version of Tor. + +TOR_VERSION=$(grep -m 1 AC_INIT 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. +TOR_VER_AT_LEAST_043=no + +# These are the currently supported Tor versions; no need to work with anything +# ancient in this script. +case "$TOR_VERSION" in + 0.3.*) + TOR_VER_AT_LEAST_043=no + ;; + 0.4.[012].*) + TOR_VER_AT_LEAST_043=no + ;; + *) + TOR_VER_AT_LEAST_043=yes + ;; +esac + ############################################################################# # Make sure the directories are all there. @@ -362,7 +385,7 @@ fi FAILED_TESTS="" -if [[ "${DOXYGEN}" = 'yes' ]]; then +if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then start_section Doxygen if runcmd make doxygen; then hooray "make doxygen has succeeded."

1 0

[tor/maint-0.4.4] CI: label our python versions.
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit adb7268236683ed54dedf455598b86596d7ab8ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:24:03 2020 -0400 CI: label our python versions. --- scripts/ci/ci-driver.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 20193e6b2a..ad08ee5af0 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -256,7 +256,9 @@ fi # Tell the user about our versions of different tools and packages. uname -a +printf "python: " python -V || echo "no 'python' binary." +printf "python3: " python3 -V || echo "no 'python3' binary." show_git_version Tor "${CI_SRCDIR}"

1 0

[tor/maint-0.4.4] CI: enable documentation testing
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 6a91a50d32c6d3beaa059660881e0c338b147b1b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 11:06:21 2020 -0400 CI: enable documentation testing --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5a46c1a0e3..abc5003678 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -105,12 +105,13 @@ debian-distcheck: script: - ./scripts/ci/ci-driver.sh +# TODO: it would be neat to disable the "make all" part of this one. debian-docs: image: debian:stable <<: *debian-template variables: - DOXYGEN: "no" - ASCIIDOC: "no" + DOXYGEN: "yes" + ASCIIDOC: "yes" CHECK: "no" script: - ./scripts/ci/ci-driver.sh

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2020