Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dnsdist: Proper HTTP response for timeouts over DoH #7927

Merged
merged 6 commits into from Jul 17, 2019

Conversation

@rgacogne
Copy link
Member

commented Jun 13, 2019

Short description

Timeouts, actively discovered or not, were not properly handled for DoH queries.
This PR is based on top of #7917 so we can send a proper HTTP status code, it will need to be rebased.

Checklist

I have:

  • read the CONTRIBUTING.md document
  • compiled this code
  • tested this code
  • included documentation (including possible behaviour changes)
  • documented the code
  • added or modified regression test(s)
  • added or modified unit test(s)

@rgacogne rgacogne added this to the dnsdist-1.4.0 milestone Jun 13, 2019

@rgacogne rgacogne force-pushed the rgacogne:dnsdist-doh-timeout branch from 4602be8 to 2cfc522 Jun 24, 2019

@rgacogne

This comment has been minimized.

Copy link
Member Author

commented Jun 25, 2019

Fixed the use-after-free race reported by ASAN on Circle CI.

rgacogne added some commits Jun 13, 2019

dnsdist: Use a separate string for the DoH query and response
In rare cases, the responder thread might get a response _before_
the send() call of the DoH client thread has returned, resulting
in ASAN reporting a use-after-free since the response was written
into the now useless query object.

@rgacogne rgacogne force-pushed the rgacogne:dnsdist-doh-timeout branch from de82b15 to 246ff31 Jul 8, 2019

@rgacogne

This comment has been minimized.

Copy link
Member Author

commented Jul 8, 2019

Rebased now that #7917 has been merged.

Show resolved Hide resolved pdns/dnsdist.cc
Show resolved Hide resolved pdns/dnsdistdist/doh.cc
Show resolved Hide resolved pdns/dnsdist.cc
@omoerbeek

This comment has been minimized.

Copy link
Member

commented Jul 16, 2019

I must say I don't grasp all of dnsdist yet, but this PR look ok (with the one comment on the nullptr case).

rgacogne added some commits Jul 16, 2019

@rgacogne

This comment has been minimized.

Copy link
Member Author

commented Jul 17, 2019

Giving up on the LGTM check, it is simply taking too long.

@rgacogne rgacogne merged commit 1353ea2 into PowerDNS:master Jul 17, 2019

23 of 26 checks passed

LGTM analysis: C/C++ Analysis failed (could not build the base commit (95e5f03))
Details
LGTM analysis: JavaScript No code changes detected
Details
LGTM analysis: Python No code changes detected
Details
ci/circleci: build-auth Your tests passed on CircleCI!
Details
ci/circleci: build-auth-docs Your tests passed on CircleCI!
Details
ci/circleci: build-dnsdist Your tests passed on CircleCI!
Details
ci/circleci: build-dnsdist-docs Your tests passed on CircleCI!
Details
ci/circleci: build-recursor Your tests passed on CircleCI!
Details
ci/circleci: build-recursor-docs Your tests passed on CircleCI!
Details
ci/circleci: test-auth-algorithms Your tests passed on CircleCI!
Details
ci/circleci: test-auth-api Your tests passed on CircleCI!
Details
ci/circleci: test-auth-regress-bind Your tests passed on CircleCI!
Details
ci/circleci: test-auth-regress-gmysql Your tests passed on CircleCI!
Details
ci/circleci: test-auth-regress-gpgsql Your tests passed on CircleCI!
Details
ci/circleci: test-auth-regress-gsqlite3 Your tests passed on CircleCI!
Details
ci/circleci: test-auth-regress-ldap Your tests passed on CircleCI!
Details
ci/circleci: test-auth-regress-lmdb Your tests passed on CircleCI!
Details
ci/circleci: test-auth-regress-mydns Your tests passed on CircleCI!
Details
ci/circleci: test-auth-regress-odbc-mssql Your tests passed on CircleCI!
Details
ci/circleci: test-auth-regress-odbc-sqlite3 Your tests passed on CircleCI!
Details
ci/circleci: test-auth-regress-tinydns Your tests passed on CircleCI!
Details
ci/circleci: test-dnsdist-regression Your tests passed on CircleCI!
Details
ci/circleci: test-recursor-api Your tests passed on CircleCI!
Details
ci/circleci: test-recursor-bulk Your tests passed on CircleCI!
Details
ci/circleci: test-recursor-regression Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@rgacogne rgacogne deleted the rgacogne:dnsdist-doh-timeout branch Jul 17, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.