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

@rgacogne rgacogne 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 dnsdist-doh-timeout branch from 4602be8 to 2cfc522 Jun 24, 2019
@rgacogne
Copy link
Member Author

@rgacogne rgacogne commented Jun 25, 2019

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

Loading

rgacogne added 2 commits Jul 8, 2019
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 dnsdist-doh-timeout branch from de82b15 to 246ff31 Jul 8, 2019
@rgacogne
Copy link
Member Author

@rgacogne rgacogne commented Jul 8, 2019

Rebased now that #7917 has been merged.

Loading

pdns/dnsdist.cc Show resolved Hide resolved
Loading
pdns/dnsdistdist/doh.cc Show resolved Hide resolved
Loading
pdns/dnsdist.cc Show resolved Hide resolved
Loading
@omoerbeek
Copy link
Member

@omoerbeek omoerbeek 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).

Loading

@rgacogne
Copy link
Member Author

@rgacogne rgacogne commented Jul 17, 2019

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

Loading

@rgacogne rgacogne merged commit 1353ea2 into PowerDNS:master Jul 17, 2019
25 of 26 checks passed
Loading
@rgacogne rgacogne deleted the 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
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants