September 2019 - tor-commits - lists.torproject.org

[tor/master] scripts/git: Quote shell arguments where possible
by nickm＠torproject.org 02 Sep '19

02 Sep '19

commit d0e31b4d1f10279280ce7cc9ece71d17a79ed6b7 Author: teor <teor(a)torproject.org> Date: Thu Aug 29 22:53:44 2019 +1000 scripts/git: Quote shell arguments where possible Most shell arguments should be quoted to avoid mistakes. But since all branch names are hard-coded, or supplied by the script user, we don't need to be too concerned about command injection. Quoting all shell arguments would take a major refactor. (Probably using arrays.) Part of 31314. --- scripts/git/git-merge-forward.sh | 10 +++++----- scripts/git/git-push-all.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index b9591eaa7..720320c9f 100755 --- a/scripts/git/git-merge-forward.sh +++ b/scripts/git/git-merge-forward.sh @@ -227,7 +227,7 @@ function validate_ret # Switch to the given branch name. function switch_branch { - local cmd="git checkout $1" + local cmd="git checkout '$1'" printf " %s Switching branch to %s..." "$MARKER" "$1" if [ $DRY_RUN -eq 0 ]; then msg=$( eval "$cmd" 2>&1 ) @@ -240,7 +240,7 @@ function switch_branch # Checkout a new branch with the given branch name. function new_branch { - local cmd="git checkout -b $1" + local cmd="git checkout -b '$1'" printf " %s Creating new branch %s..." "$MARKER" "$1" if [ $DRY_RUN -eq 0 ]; then msg=$( eval "$cmd" 2>&1 ) @@ -254,7 +254,7 @@ function new_branch # branch name. function switch_or_new_branch { - local cmd="git rev-parse --verify $1" + local cmd="git rev-parse --verify '$1'" if [ $DRY_RUN -eq 0 ]; then # Call switch_branch if there is a branch, or new_branch if there is not msg=$( eval "$cmd" 2>&1 ) @@ -292,7 +292,7 @@ function pull_branch # Merge the given branch name ($1) into the current branch ($2). function merge_branch { - local cmd="git merge --no-edit $1" + local cmd="git merge --no-edit '$1'" printf " %s Merging branch %s into %s..." "$MARKER" "$1" "$2" if [ $DRY_RUN -eq 0 ]; then msg=$( eval "$cmd" 2>&1 ) @@ -305,7 +305,7 @@ function merge_branch # Pull the given branch name. function merge_branch_origin { - local cmd="git merge --ff-only origin/$1" + local cmd="git merge --ff-only 'origin/$1'" printf " %s Merging branch origin/%s..." "$MARKER" "$1" if [ $DRY_RUN -eq 0 ]; then msg=$( eval "$cmd" 2>&1 ) diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index 0b3cfcd88..37a73ec95 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -171,7 +171,7 @@ fi if [ "$PUSH_SAME" -eq 0 -a "$TEST_BRANCH_PREFIX" ]; then NEW_PUSH_BRANCHES= for b in $PUSH_BRANCHES; do - PUSH_COMMIT=`git rev-parse $b` + PUSH_COMMIT=`git rev-parse "$b"` SKIP_UPSTREAM= for u in $DEFAULT_UPSTREAM_BRANCHES $UPSTREAM_BRANCHES; do UPSTREAM_COMMIT=`git rev-parse "$u"`

1 0

[tor/master] scripts/git: fix shellcheck issues in git-push-all.sh
by nickm＠torproject.org 02 Sep '19

02 Sep '19

commit e155598fe305657c60eb803b632e9efe0a91d1cd Author: teor <teor(a)torproject.org> Date: Thu Aug 29 23:05:56 2019 +1000 scripts/git: fix shellcheck issues in git-push-all.sh Part of 31314. --- scripts/git/git-push-all.sh | 50 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index 37a73ec95..8e49e81b9 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -60,22 +60,22 @@ while getopts ":r:st:" opt; do echo " *** PUSHING TO REMOTE: ${UPSTREAM_REMOTE} ***" shift shift - OPTIND=$[$OPTIND - 2] + OPTIND=$((OPTIND - 2)) ;; - s) PUSH_SAME=$[! "$PUSH_SAME" ] + s) PUSH_SAME=$((! PUSH_SAME)) if [ "$PUSH_SAME" -eq 0 ]; then echo " *** SKIPPING UNCHANGED TEST BRANCHES ***" else echo " *** PUSHING UNCHANGED TEST BRANCHES ***" fi shift - OPTIND=$[$OPTIND - 1] + OPTIND=$((OPTIND - 1)) ;; t) TEST_BRANCH_PREFIX="$OPTARG" echo " *** PUSHING TEST BRANCHES: ${TEST_BRANCH_PREFIX}_nnn ***" shift shift - OPTIND=$[$OPTIND - 2] + OPTIND=$((OPTIND - 2)) ;; *) # Assume we're done with script arguments, @@ -91,10 +91,10 @@ if [ "$1" = "--" ]; then shift fi -echo "Calling git push --atomic $@ <branches>" +echo "Calling $GIT_PUSH" "$@" "<branches>" if [ "$TEST_BRANCH_PREFIX" ]; then - if [ "$UPSTREAM_REMOTE" = ${TOR_UPSTREAM_REMOTE_NAME:-"upstream"} ]; then + if [ "$UPSTREAM_REMOTE" = "${TOR_UPSTREAM_REMOTE_NAME:-upstream}" ]; then echo "Pushing test branches ${TEST_BRANCH_PREFIX}_nnn to " \ "$UPSTREAM_REMOTE is not allowed." echo "Usage: $0 -r <remote-name> -t <test-branch-prefix> <git-opts>" @@ -108,22 +108,22 @@ fi DEFAULT_UPSTREAM_BRANCHES= if [ "$DEFAULT_UPSTREAM_REMOTE" != "$UPSTREAM_REMOTE" ]; then - DEFAULT_UPSTREAM_BRANCHES=`echo \ - ${DEFAULT_UPSTREAM_REMOTE}/master \ - ${DEFAULT_UPSTREAM_REMOTE}/{release,maint}-0.4.1 \ - ${DEFAULT_UPSTREAM_REMOTE}/{release,maint}-0.4.0 \ - ${DEFAULT_UPSTREAM_REMOTE}/{release,maint}-0.3.5 \ - ${DEFAULT_UPSTREAM_REMOTE}/{release,maint}-0.2.9 \ - ` + DEFAULT_UPSTREAM_BRANCHES=$(echo \ + "$DEFAULT_UPSTREAM_REMOTE"/master \ + "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.1 \ + "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.0 \ + "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.3.5 \ + "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.2.9 \ + ) fi -UPSTREAM_BRANCHES=`echo \ - ${UPSTREAM_REMOTE}/master \ - ${UPSTREAM_REMOTE}/{release,maint}-0.4.1 \ - ${UPSTREAM_REMOTE}/{release,maint}-0.4.0 \ - ${UPSTREAM_REMOTE}/{release,maint}-0.3.5 \ - ${UPSTREAM_REMOTE}/{release,maint}-0.2.9 \ - ` +UPSTREAM_BRANCHES=$(echo \ + "$UPSTREAM_REMOTE"/master \ + "$UPSTREAM_REMOTE"/{release,maint}-0.4.1 \ + "$UPSTREAM_REMOTE"/{release,maint}-0.4.0 \ + "$UPSTREAM_REMOTE"/{release,maint}-0.3.5 \ + "$UPSTREAM_REMOTE"/{release,maint}-0.2.9 \ + ) ######################## # Git branches to push # @@ -154,13 +154,13 @@ else # Test branch mode: merge to maint only, and create a new branch for 0.2.9 # # List of branches to push. Ordering is not important. - PUSH_BRANCHES=$(echo \ + PUSH_BRANCHES=" \ ${TEST_BRANCH_PREFIX}_master \ ${TEST_BRANCH_PREFIX}_041 \ ${TEST_BRANCH_PREFIX}_040 \ ${TEST_BRANCH_PREFIX}_035 \ ${TEST_BRANCH_PREFIX}_029 \ - ) + " fi ############### @@ -168,13 +168,13 @@ fi ############### # Skip the test branches that are the same as the upstream branches -if [ "$PUSH_SAME" -eq 0 -a "$TEST_BRANCH_PREFIX" ]; then +if [ "$PUSH_SAME" -eq 0 ] && [ "$TEST_BRANCH_PREFIX" ]; then NEW_PUSH_BRANCHES= for b in $PUSH_BRANCHES; do - PUSH_COMMIT=`git rev-parse "$b"` + PUSH_COMMIT=$(git rev-parse "$b") SKIP_UPSTREAM= for u in $DEFAULT_UPSTREAM_BRANCHES $UPSTREAM_BRANCHES; do - UPSTREAM_COMMIT=`git rev-parse "$u"` + UPSTREAM_COMMIT=$(git rev-parse "$u") if [ "$PUSH_COMMIT" = "$UPSTREAM_COMMIT" ]; then SKIP_UPSTREAM="$u" fi

1 0

[tor/master] scripts/git: Improve usage documentation for merge-forward and push-all
by nickm＠torproject.org 02 Sep '19

02 Sep '19

commit 664e6a392ed0ace86e0182dc25bf365e8e34ed9d Author: teor <teor(a)torproject.org> Date: Thu Aug 29 22:52:21 2019 +1000 scripts/git: Improve usage documentation for merge-forward and push-all Part of 31314. --- scripts/git/git-merge-forward.sh | 12 ++++++++++++ scripts/git/git-push-all.sh | 25 +++++++++++++++++++------ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index a7e797eaf..b9591eaa7 100755 --- a/scripts/git/git-merge-forward.sh +++ b/scripts/git/git-merge-forward.sh @@ -1,5 +1,17 @@ #!/usr/bin/env bash +# Usage: git-merge-forward.sh -n -t <test-branch-prefix> -u +# arguments: +# -n: dry run mode +# -t: test branch mode: create new branches from the commits checked +# out in each maint directory. Call these branches prefix_029, +# prefix_035, ... , prefix_master. +# -u: in test branch mode, if a prefix_* branch exists, skip creating +# that branch. Use after a merge error, to restart the merge +# forward at the first unmerged branch. +# env vars: +# See the Configuration section for env vars and their default values. + ################# # Configuration # ################# diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index 8a8ef1f2d..0b3cfcd88 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -2,12 +2,25 @@ # Usage: git-push-all.sh -t <test-branch-prefix> -r <remote-name> -s # -- <git-opts> -# env vars: TOR_UPSTREAM_REMOTE_NAME=upstream TOR_PUSH_DELAY=0 -# git-opts: --no-atomic --dry-run (any other git push option) -# -# TOR_PUSH_DELAY pushes the master and maint branches separately, so that CI -# runs in a sensible order. -# push --atomic is the default when TOR_PUSH_DELAY=0, and for release branches. +# arguments: +# -t: test branch mode: Push test branches, rather than maint and +# release branches. Pushes the branches called prefix_029, +# prefix_035, ... , prefix_master. +# -r: push to remote-name, rather than $TOR_UPSTREAM_REMOTE_NAME. +# -s: push branches whose tips match upstream maint, release, or +# master branches. The default is to skip these branches. Use +# -s when testing for CI environment failures with old code. +# --: pass any other arguments to git, rather than the script. +# env vars: +# TOR_GIT_PUSH: the git push command and arguments +# TOR_UPSTREAM_REMOTE_NAME: the default upstream, overridden by -r +# TOR_PUSH_DELAY: pushes the master and maint branches separately, +# so that CI runs in a sensible order. +# TOR_PUSH_SAME: push branches whose tips match upstream maint, +# release, or master branches. Inverted by -s. +# See the Configuration section for env var default values. +# git-opts: +# --no-atomic --dry-run (and any other git push option) set -e

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1272'
by nickm＠torproject.org 02 Sep '19

02 Sep '19

commit 78307ed1866ffdec58aaac14f24ba3d77c571f59 Merge: 01bda9bed e155598fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 2 14:13:32 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1272' changes/ticket31314 | 18 +++ scripts/git/git-merge-forward.sh | 281 +++++++++++++++++++++++++++++++-------- scripts/git/git-push-all.sh | 219 +++++++++++++++++++++++++++--- 3 files changed, 445 insertions(+), 73 deletions(-)

1 0

[tor/maint-0.4.1] Change loglevel of message 'Hash of session info was not as expected'
by nickm＠torproject.org 02 Sep '19

02 Sep '19

commit 05fa1689eb96a1249030e1d51828a308d19d728c Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Jul 20 18:28:07 2019 +0300 Change loglevel of message 'Hash of session info was not as expected' --- changes/bug12399 | 3 +++ src/feature/rend/rendmid.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug12399 b/changes/bug12399 new file mode 100644 index 000000000..922c08c5e --- /dev/null +++ b/changes/bug12399 @@ -0,0 +1,3 @@ + o Minor bugfixes (logging): + - Change log level of message "Hash of session info was not as expected" + to LOG_PROTOCOL_WARN. Fixes bug 12399; bugfix on 0.1.1.10-alpha. diff --git a/src/feature/rend/rendmid.c b/src/feature/rend/rendmid.c index fcfa5052c..3ba48f885 100644 --- a/src/feature/rend/rendmid.c +++ b/src/feature/rend/rendmid.c @@ -70,7 +70,8 @@ rend_mid_establish_intro_legacy(or_circuit_t *circ, const uint8_t *request, goto err; } if (tor_memneq(expected_digest, request+2+asn1len, DIGEST_LEN)) { - log_warn(LD_PROTOCOL, "Hash of session info was not as expected."); + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Hash of session info was not as expected."); reason = END_CIRC_REASON_TORPROTOCOL; goto err; }

1 0

[tor/master] Change loglevel of message 'Hash of session info was not as expected'
by nickm＠torproject.org 02 Sep '19

02 Sep '19

commit 05fa1689eb96a1249030e1d51828a308d19d728c Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Jul 20 18:28:07 2019 +0300 Change loglevel of message 'Hash of session info was not as expected' --- changes/bug12399 | 3 +++ src/feature/rend/rendmid.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug12399 b/changes/bug12399 new file mode 100644 index 000000000..922c08c5e --- /dev/null +++ b/changes/bug12399 @@ -0,0 +1,3 @@ + o Minor bugfixes (logging): + - Change log level of message "Hash of session info was not as expected" + to LOG_PROTOCOL_WARN. Fixes bug 12399; bugfix on 0.1.1.10-alpha. diff --git a/src/feature/rend/rendmid.c b/src/feature/rend/rendmid.c index fcfa5052c..3ba48f885 100644 --- a/src/feature/rend/rendmid.c +++ b/src/feature/rend/rendmid.c @@ -70,7 +70,8 @@ rend_mid_establish_intro_legacy(or_circuit_t *circ, const uint8_t *request, goto err; } if (tor_memneq(expected_digest, request+2+asn1len, DIGEST_LEN)) { - log_warn(LD_PROTOCOL, "Hash of session info was not as expected."); + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Hash of session info was not as expected."); reason = END_CIRC_REASON_TORPROTOCOL; goto err; }

1 0

[tor/maint-0.4.1] Merge branch 'ticket12399_035' into maint-0.4.1
by nickm＠torproject.org 02 Sep '19

02 Sep '19

commit e3a458e441fe9f823d564ca66753e3b76c7c0943 Merge: 25e7fc5b7 05fa1689e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 2 14:11:18 2019 -0400 Merge branch 'ticket12399_035' into maint-0.4.1 changes/bug12399 | 3 +++ src/feature/rend/rendmid.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'ticket12399_035' into maint-0.4.1
by nickm＠torproject.org 02 Sep '19

02 Sep '19

commit e3a458e441fe9f823d564ca66753e3b76c7c0943 Merge: 25e7fc5b7 05fa1689e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 2 14:11:18 2019 -0400 Merge branch 'ticket12399_035' into maint-0.4.1 changes/bug12399 | 3 +++ src/feature/rend/rendmid.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.1'
by nickm＠torproject.org 02 Sep '19

02 Sep '19

commit 01bda9bed1bbbeb808053ff9b23e5db4e10dd765 Merge: f538e2398 e3a458e44 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 2 14:11:32 2019 -0400 Merge branch 'maint-0.4.1' changes/bug12399 | 3 +++ src/feature/rend/rendmid.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.1] Merge branch 'ticket12399_035' into maint-0.4.1
by nickm＠torproject.org 02 Sep '19

02 Sep '19

commit e3a458e441fe9f823d564ca66753e3b76c7c0943 Merge: 25e7fc5b7 05fa1689e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 2 14:11:18 2019 -0400 Merge branch 'ticket12399_035' into maint-0.4.1 changes/bug12399 | 3 +++ src/feature/rend/rendmid.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0