July 2017 - tor-commits - lists.torproject.org

[tor/maint-0.3.0] Fix and expand upon our Travis CI configuration.
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit 68722a1ddfdc07f84582d40ea484905050259987 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jul 11 20:12:15 2017 +0000 Fix and expand upon our Travis CI configuration. * CHANGE .travis.yml so that commands for different purposes (e.g. getting dependencies, building, testing) are in separate config lines and sections. * CHANGE .travis.yml to use their mechanism for installing dependencies via apt. [0] This also allows us to not need sudo (the "sudo: false" line). * CHANGE Travis CI tests (the "script:" section) to build and run tests in the same manner as Jenkins (i.e. with --enable-fatal-warnings and --disable-silent-rules and run `make check`). * ADD Travis configuration to do all the target builds with both GCC and clang. * ADD make flags to build with both of the cores available. * ADD notifications for IRC, and configure email notifications (to the author of the commit) only if the branch was previously building successfully and the latest commit broke it. * ADD the ability to run the Travis build matrix for OSX as well, but leave it commented out by default (because it takes roughly ten times longer, due to a shortage of OSX build machines). * ADD Travis config option to cancel/fail the build early if one target has already failed ("fast_finish: true"). * ADD comments to describe what our Travis config is doing and why it is configured that way. [0]: https://docs.travis-ci.com/user/installing-dependencies/#Installing-Package…) --- .travis.yml | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 73 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd520748e..0b3217268 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,78 @@ language: c -sudo: enabled + +compiler: + - gcc + - clang + +notifications: + irc: + channels: + - "irc.oftc.net#tor-bots" + template: + - "%{repository} %{branch} %{commit} - %{author}: %{commit_subject}" + - "Build #%{build_number} %{result}. Details: %{build_url}" + on_success: change + on_failure: change + email: + on_success: never + on_failure: change + +os: + - linux + ## Uncomment the following line to also run the entire build matrix on OSX. + ## This will make your CI builds take roughly ten times longer to finish. + # - osx + +## Use the Ubuntu Trusty images. dist: trusty +## We don't need sudo. (The "apt:" stanza after this allows us to not need sudo; +## otherwise, we would need it for getting dependencies.) +sudo: false + +## (Linux only) Download our dependencies +addons: + apt: + packages: + - libevent-dev + - libseccomp2 + - zlib1g-dev + +## The build matrix in the following two stanzas expands into four builds (per OS): +## +## * with GCC, with Rust +## * with GCC, without Rust +## * with Clang, with Rust +## * with Clang, without Rust +env: + global: + ## The Travis CI environment allows us two cores, so let's use both. + - MAKEFLAGS="-j 2" + +matrix: + ## If one build in the matrix fails (e.g. if building withour Rust and Clang + ## fails, but building with Rust and GCC is still going), then cancel the + ## entire job early and call the whole thing a failure. + fast_finish: true + before_install: - - sudo apt-get -qq update - - sudo apt-get -y install libevent-dev libseccomp2 zlib1g-dev - - curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable + ## If we're on OSX, homebrew usually needs to updated first + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi + ## Download rustup + - curl -Ssf -o rustup.sh https://sh.rustup.rs + +install: + ## If we're on OSX use brew to install dependencies (for Linux, see the "apt:" section above) + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated openssl || brew upgrade openssl; }; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated openssl || brew upgrade libevent; }; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated openssl || brew upgrade pkg-config; }; fi + +script: + - ./autogen.sh + - ./configure $RUST_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules + ## We run `make check` because that's what https://jenkins.torproject.org does. + - make check -script: ./autogen.sh && ./configure --disable-asciidoc && make test +after_failure: + ## `make check` will leave a log file with more details of test failures. + - cat test-suite.log

1 0

[meek/master] Add a comment about why we leave body == nil for empty buffers.
by dcf＠torproject.org 26 Jul '17

26 Jul '17

commit f1c82168ea3909ad94e7814cee86fefcbf207b52 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jul 26 11:49:40 2017 -0700 Add a comment about why we leave body == nil for empty buffers. --- meek-client/meek-client.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index d378b8b..c2ceaf9 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -118,6 +118,15 @@ type RequestInfo struct { func roundTripWithHTTP(buf []byte, info *RequestInfo) (*http.Response, error) { var body io.Reader if len(buf) > 0 { + // Leave body == nil when buf is empty. A nil body is an + // explicit signal that the body is empty. An empty + // *bytes.Reader or the magic value http.NoBody are supposed to + // be equivalent ways to signal an empty body, but in Go 1.8 the + // HTTP/2 code only understands nil. Not leaving body == nil + // causes the Content-Length header to be omitted from HTTP/2 + // requests, which in some cases can cause the server to return + // a 411 "Length Required" error. See + // https://bugs.torproject.org/22865. body = bytes.NewReader(buf) } req, err := http.NewRequest("POST", info.URL.String(), body)

1 0

[meek/master] Explicitly set Content-Length to zero when there is no data to send.
by dcf＠torproject.org 26 Jul '17

26 Jul '17

commit 0ea861efe5873b517fbd08c4bc48027e4db16a95 Author: Ivan Markin <twim(a)riseup.net> Date: Sun Jul 9 19:56:56 2017 +0000 Explicitly set Content-Length to zero when there is no data to send. Since Go 1.8 http.Transport does not set Content-Length header if body contains no bytes. https://golang.org/doc/go1.8#net_http https://go-review.googlesource.com/c/31445/ However some of domain fronts do inspect Content-Length header and return 411 error when it is not set. This breaks connection entierly since these packets do not travel beyond a frontend to a meek server. Closes #22865. --- meek-client/meek-client.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 9a818d0..d378b8b 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -116,7 +116,11 @@ type RequestInfo struct { // Do an HTTP roundtrip using the payload data in buf and the request metadata // in info. func roundTripWithHTTP(buf []byte, info *RequestInfo) (*http.Response, error) { - req, err := http.NewRequest("POST", info.URL.String(), bytes.NewReader(buf)) + var body io.Reader + if len(buf) > 0 { + body = bytes.NewReader(buf) + } + req, err := http.NewRequest("POST", info.URL.String(), body) if err != nil { return nil, err }

1 0

[meek/master] Update programVersion = "0.28".
by dcf＠torproject.org 26 Jul '17

26 Jul '17

commit 8343a84ee80de190781bb90246d9e45e42ffbcc3 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jul 26 11:50:47 2017 -0700 Update programVersion = "0.28". --- meek-server/meek-server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index 908fb8b..b599280 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -42,7 +42,7 @@ import ( ) const ( - programVersion = "0.27" + programVersion = "0.28" ptMethodName = "meek" // Reject session ids shorter than this, as a weak defense against

1 0

[tor/release-0.3.0] Merge branch 'bug23030_029_v2' into maint-0.2.9
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit 0117e2ea0dc09408e2fbc7224e335968af009874 Merge: 6d3c5b8fb 32b9edeb9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 12:58:17 2017 -0400 Merge branch 'bug23030_029_v2' into maint-0.2.9 changes/bug23030_029 | 7 +++++++ src/common/util_bug.h | 13 +++++++++++++ 2 files changed, 20 insertions(+)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit 18734d3b25f3a26fea3fd78e64136da9bcd3836d Merge: 3c017e823 0117e2ea0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 12:58:22 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug23030_029 | 7 +++++++ src/common/util_bug.h | 13 +++++++++++++ 2 files changed, 20 insertions(+)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit a2523196a4acb18610dae147bfc385e7fa0058a0 Merge: ea5368026 18734d3b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 12:58:22 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug23030_029 | 7 +++++++ src/common/util_bug.h | 13 +++++++++++++ 2 files changed, 20 insertions(+)

1 0

[tor/release-0.3.1] Fix build warnings from Coverity related to our BUG macro
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit 32b9edeb91a7d9b9752083622d1ce400f45e42ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 25 10:14:24 2017 -0400 Fix build warnings from Coverity related to our BUG macro In the Linux kernel, the BUG() macro causes an instant panic. Our BUG() macro is different, however: it generates a nonfatal assertion failure, and is usable as an expression. Additionally, this patch tells util_bug.h to make all assertion failures into fatal conditions when we're building with a static analysis tool, so that the analysis tool can look for instances where they're reachable. Fixes bug 23030. --- changes/bug23030_029 | 7 +++++++ src/common/util_bug.h | 13 +++++++++++++ 2 files changed, 20 insertions(+) diff --git a/changes/bug23030_029 b/changes/bug23030_029 new file mode 100644 index 000000000..89a1b507d --- /dev/null +++ b/changes/bug23030_029 @@ -0,0 +1,7 @@ + o Minor bugfixes (coverity builds): + - Avoid Coverity build warnings related to our BUG() macro. By + default, Coverity treats BUG() as the Linux kernel does: an + instant abort(). We need to override that so our BUG() macro + doesn't prevent Coverity from analyzing functions that use it. + Fixes bug 23030; bugfix on 0.2.9.1-alpha. + diff --git a/src/common/util_bug.h b/src/common/util_bug.h index e02778110..069580691 100644 --- a/src/common/util_bug.h +++ b/src/common/util_bug.h @@ -58,6 +58,19 @@ * return -1; */ +#ifdef __COVERITY__ +#undef BUG +// Coverity defines this in global headers; let's override it. This is a +// magic coverity-only preprocessor thing. +#nodef BUG(x) ((x)?(__coverity_panic__(),1):0) +#endif + +#if defined(__COVERITY__) || defined(__clang_analyzer__) +// We're running with a static analysis tool: let's treat even nonfatal +// assertion failures as something that we need to avoid. +#define ALL_BUGS_ARE_FATAL +#endif + #ifdef ALL_BUGS_ARE_FATAL #define tor_assert_nonfatal_unreached() tor_assert(0) #define tor_assert_nonfatal(cond) tor_assert((cond))

1 0

[tor/release-0.3.1] Merge branch 'bug23030_029_v2' into maint-0.2.9
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit 0117e2ea0dc09408e2fbc7224e335968af009874 Merge: 6d3c5b8fb 32b9edeb9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 12:58:17 2017 -0400 Merge branch 'bug23030_029_v2' into maint-0.2.9 changes/bug23030_029 | 7 +++++++ src/common/util_bug.h | 13 +++++++++++++ 2 files changed, 20 insertions(+)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit 18734d3b25f3a26fea3fd78e64136da9bcd3836d Merge: 3c017e823 0117e2ea0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 12:58:22 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug23030_029 | 7 +++++++ src/common/util_bug.h | 13 +++++++++++++ 2 files changed, 20 insertions(+)

1 0