Accept a wider range of content types for DoH API calls. #3046
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
matthieusieben
requested changes
Dec 8, 2024
| @@ -54,7 +54,7 @@ function dohResolveTxtFactory({ | |||
| ? await response.text() | |||
| : `Failed to resolve ${hostname}` | |||
| throw new TypeError(message) | |||
| } else if (contentType !== 'application/dns-json') { | |||
| } else if (contentType?.match(/application\/(dns-)json/i) == null) { | |||
There was a problem hiding this comment.
Did you mean to make the (dns-) part optional ? Or is there no particular meaning behind the parenthesis there ?
There was a problem hiding this comment.
oh god, it definetly must be optional (that's half the point of my PR), sorry about that. I fixed it.
matthieusieben
approved these changes
Dec 12, 2024
matthieusieben
approved these changes
Dec 17, 2024
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, the DoH calls fail when using google's DoH API, since it returns "application/json; charset=UTF-8" as its response's content-type and the code expects "application/dns-json" (which seems to be particular to Cloudflare).
Notice that Alibaba Cloud's DoH returns "application/json", for example.
While there is no agreed upon MIME type for DoH's JSON Schema, it seems judicious to have the doh handle resolver to accept at least the major existing APIs out of the box.