Removed jpath import

master
h345983745 2019-02-07 21:05:07 +00:00
parent 613cbaa556
commit 75a58f465c
1 changed files with 21 additions and 3 deletions

View File

@ -3,7 +3,6 @@
* @copyright Crown Copyright 2019 * @copyright Crown Copyright 2019
* @license Apache-2.0 * @license Apache-2.0
*/ */
import jpath from "jsonpath";
import Operation from "../Operation"; import Operation from "../Operation";
import OperationError from "../errors/OperationError"; import OperationError from "../errors/OperationError";
@ -19,7 +18,7 @@ class HTTPSOverDNS extends Operation {
super(); super();
this.name = "DNS over HTTPS"; this.name = "DNS over HTTPS";
this.module = "Code"; this.module = "Default";
this.description = ["Takes a single domain name and performs a DNS lookup using DNS over HTTPS.", this.description = ["Takes a single domain name and performs a DNS lookup using DNS over HTTPS.",
"<br><br>", "<br><br>",
"By default, <a href='https://developers.cloudflare.com/1.1.1.1/dns-over-https/'>Cloudflare</a> and <a href='https://developers.google.com/speed/public-dns/docs/dns-over-https'>Google</a> DNS over HTTPS services are supported.", "By default, <a href='https://developers.cloudflare.com/1.1.1.1/dns-over-https/'>Cloudflare</a> and <a href='https://developers.google.com/speed/public-dns/docs/dns-over-https'>Google</a> DNS over HTTPS services are supported.",
@ -93,7 +92,7 @@ class HTTPSOverDNS extends Operation {
}) })
.then(data => { .then(data => {
if (justAnswer) { if (justAnswer) {
return jpath.query(data, "$.Answer[*].data"); return this.extractData(data.Answer);
} }
return data; return data;
@ -104,6 +103,25 @@ class HTTPSOverDNS extends Operation {
} }
/**
* Construct an array of just data from a DNS Answer section
* @private
* @param {JSON} data
* @returns {JSON}
*/
extractData(data) {
if (typeof(data) == "undefined"){
return [];
} else {
const dataValues = [];
data.forEach(element => {
dataValues.push(element.data);
});
return dataValues;
}
}
} }
export default HTTPSOverDNS; export default HTTPSOverDNS;