|
|
@ -8,7 +8,7 @@ export default {get_qname, get_response, preread_doh_request, preread_dns_reques |
|
|
|
* 2: As 1, but also parse answers. We can log the answers, and also cache responses in HTTP Content-Cache |
|
|
|
* 2: As 1, but also parse answers. We can log the answers, and also cache responses in HTTP Content-Cache |
|
|
|
* 3: Very Verbose, log everything as above, but also write packet data to error log (slowest) |
|
|
|
* 3: Very Verbose, log everything as above, but also write packet data to error log (slowest) |
|
|
|
**/ |
|
|
|
**/ |
|
|
|
var dns_decode_level = 2; |
|
|
|
var dns_decode_level = 3; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* DNS Question Load Balancing |
|
|
|
* DNS Question Load Balancing |
|
|
@ -47,49 +47,58 @@ function process_doh_request(s, decode, scrub) { |
|
|
|
if ( data.length == 0 ) { |
|
|
|
if ( data.length == 0 ) { |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
data.split("\r\n").forEach( function(line) { |
|
|
|
const lines = data.split("\r\n"); |
|
|
|
var bytes; |
|
|
|
var bytes; |
|
|
|
var packet; |
|
|
|
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("&"); |
|
|
|
|
|
|
|
debug(s, "process_doh_request: QS Params: " + qs ); |
|
|
|
|
|
|
|
qs.some( param => { |
|
|
|
|
|
|
|
if (param.startsWith("dns=") ) { |
|
|
|
|
|
|
|
bytes = String.bytesFrom(param.slice(4), "base64url"); |
|
|
|
|
|
|
|
return true; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return false; |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if ( line.toString('hex').startsWith( '0000') ) { |
|
|
|
if(lines[0].startsWith("POST")) { |
|
|
|
bytes = line; |
|
|
|
const index = lines.findIndex(line=>{ |
|
|
|
} else if ( line.toString().startsWith("GET /dns-query?") ) { |
|
|
|
if(line.length == 0) { |
|
|
|
var qs = line.slice("GET /dns-query?".length, line.length - " HTTP/1.1".length) |
|
|
|
return true; |
|
|
|
qs = qs.split("&"); |
|
|
|
} |
|
|
|
debug(s, "process_doh_request: QS Params: " + qs ); |
|
|
|
}) |
|
|
|
qs.some( param => { |
|
|
|
if(index>0 && lines.length >= index + 1){ |
|
|
|
if ( param.startsWith("dns=") ) { |
|
|
|
bytes = lines[index + 1]; |
|
|
|
bytes = String.bytesFrom(param.slice(4), "base64url"); |
|
|
|
|
|
|
|
return true; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return false; |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (bytes) { |
|
|
|
if (bytes) { |
|
|
|
debug(s, "process_doh_request: DNS Req: " + bytes.toString('hex') ); |
|
|
|
debug(s, "process_doh_request: DNS Req: " + bytes.toString('hex') ); |
|
|
|
if (decode) { |
|
|
|
if (decode) { |
|
|
|
packet = dns.parse_packet(bytes); |
|
|
|
packet = dns.parse_packet(bytes); |
|
|
|
debug(s, "process_doh_request: DNS Req ID: " + packet.id ); |
|
|
|
debug(s, "process_doh_request: DNS Req ID: " + packet.id ); |
|
|
|
dns.parse_question(packet); |
|
|
|
dns.parse_question(packet); |
|
|
|
debug(s,"process_doh_request: DNS Req Name: " + packet.question.name); |
|
|
|
debug(s,"process_doh_request: DNS Req Name: " + packet.question.name); |
|
|
|
dns_name = packet.question.name; |
|
|
|
dns_name = packet.question.name; |
|
|
|
} |
|
|
|
} |
|
|
|
if (scrub) { |
|
|
|
if (scrub) { |
|
|
|
domain_scrub(s, bytes, packet); |
|
|
|
domain_scrub(s, bytes, packet); |
|
|
|
s.done(); |
|
|
|
s.done(); |
|
|
|
} else { |
|
|
|
|
|
|
|
s.send( to_bytes(bytes.length) ); |
|
|
|
|
|
|
|
s.send( bytes, {flush: true} ); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} else { |
|
|
|
} else { |
|
|
|
if ( ! scrub) { |
|
|
|
s.send( to_bytes(bytes.length) ); |
|
|
|
debug(s, "process_doh_request: DNS Req: " + line.toString() ); |
|
|
|
s.send( bytes, {flush: true} ); |
|
|
|
s.send(""); |
|
|
|
|
|
|
|
data = ""; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
} else { |
|
|
|
|
|
|
|
if ( ! scrub) { |
|
|
|
|
|
|
|
debug(s, "process_doh_request: DNS Req: " + line.toString() ); |
|
|
|
|
|
|
|
s.send(""); |
|
|
|
|
|
|
|
data = ""; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|