Skip to content

fix: DNS over HTTP(S) POST has broken encoding #27

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.

Sign up for GitHub

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

Open
honigpferd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: DNS over HTTP(S) POST has broken encoding #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 6 additions & 16 deletions njs.d/dns/dns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,12 @@ function process_doh_request(s, decode, scrub) {
if ( data.length == 0 ) {
return;
}
var dataString = data.toString('utf8');
const lines = dataString.split("\r\n");
var bytes;
var packet;
if(lines[0].startsWith("GET")) {
var line = lines[0];
var path = line.split(" ")[1]
var params = path.split("?")[1]
var qs = params.split("&");
if(data.toString('utf8', 0, 3) == "GET") {
const path = data.toString('utf8', 4, data.indexOf(' ', 4));
const params = path.split("?")[1]
const qs = params.split("&");
qs.some( param => {
if (param.startsWith("dns=") ) {
bytes = Buffer.from(param.slice(4), "base64url");
Expand All @@ -72,15 +69,8 @@ function process_doh_request(s, decode, scrub) {
});
}

if(lines[0].startsWith("POST")) {
const index = lines.findIndex(line=>{
if(line.length == 0) {
return true;
}
})
if(index>0 && lines.length >= index + 1){
bytes = Buffer.from(lines[index + 1]);
}
if(data.toString('utf8', 0, 4) == "POST") {
bytes = data.slice(data.indexOf('\r\n\r\n') + 4);
}

if (bytes) {
Expand Down