7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-08-10 03:05:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Implement specify Port for DNS Monitor #1059

Browse Source 
This commit should fully implement #1059. When the user selects the DNS
monitor option, a new input box has been added below the resolver
address allowing the user to implement the port to access the resolver
on. This uses the same `monitor.port` as the TCP monitor but a monitor
has been added to prefill the port value to the default of `53` if the
value in this field has not already been set. This is then cleared if
the user selects a different monitor type and has not changed the port
value. A translation has also been added explaining what this field
does in order to reduce any confusion. JSDoc documentation has also been
added to the `dnsResolve` function in `util-server.js`.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
This commit is contained in:
Matthew Nickson
2022-04-13 21:02:19 +01:00
parent e38742a2d0
commit b893d50e45
4 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/model/monitor.js
View File

@@ -249,7 +249,7 @@ class Monitor extends BeanModel {
let startTime = dayjs().valueOf();
let dnsMessage = "";
let dnsRes = await dnsResolve(this.hostname, this.dns_resolve_server, this.dns_resolve_type);
let dnsRes = await dnsResolve(this.hostname, this.dns_resolve_server, this.port, this.dns_resolve_type);
bean.ping = dayjs().valueOf() - startTime;
if (this.dns_resolve_type == "A" || this.dns_resolve_type == "AAAA" || this.dns_resolve_type == "TXT") {

12
server/util-server.js
View File

@@ -89,9 +89,17 @@ exports.pingAsync = function (hostname, ipv6 = false) {
});
};
exports.dnsResolve = function (hostname, resolver_server, rrtype) {
/**
* Resolves a given record using the specified DNS server
* @param {string} hostname The hostname of the record to lookup
* @param {string} resolver_server The DNS server to use
* @param {string} resolver_port The port the DNS server is listening on
* @param {string} rrtype The type of record to request
* @returns {Promise} Promise object represents DNS lookup result
*/
exports.dnsResolve = function (hostname, resolver_server, resolver_port, rrtype) {
const resolver = new Resolver();
resolver.setServers([resolver_server]);
resolver.setServers([`${resolver_server}:${resolver_port}`]);
return new Promise((resolve, reject) => {
if (rrtype == "PTR") {
resolver.reverse(hostname, (err, records) => {