-
+
-
-
+
@@ -1516,19 +1514,18 @@ message HealthCheckResponse {
},
conditionVariables() {
+ // For DNS monitor, the variables depend on rrtype. Conditions for
+ // all rrtypes are added to an array in the DnsMonitorType class in
+ // order to pass to Vue, then identified based on index.
if (this.monitor.type === "dns") {
- // When the monitor type is DNS, the conditions depend on
- // record type. Condition variables are all added to a single
- // array defined in server\monitor-types\dns.js in order to
- // pass to Vue, then sliced below based on index.
const dnsConditionVariables = this.$root.monitorTypeList["dns"]?.conditionVariables;
switch (this.monitor.dnsResolveType) {
case "A":
case "AAAA":
case "TXT":
- case "PTR":
case "NS":
return dnsConditionVariables.slice(0, 1);
+ case "PTR":
case "CNAME":
return dnsConditionVariables.slice(1, 2);
case "CAA":
diff --git a/test/backend-test/test-dns.js b/test/backend-test/test-dns.js
new file mode 100644
index 000000000..fa2fb998b
--- /dev/null
+++ b/test/backend-test/test-dns.js
@@ -0,0 +1,181 @@
+const { describe, test } = require("node:test");
+const assert = require("node:assert");
+const { DnsMonitorType } = require("../../server/monitor-types/dns");
+const { UP, PENDING } = require("../../src/util");
+
+const queryName = ".";
+const rrtype = "NS";
+const sampleRecordRegex = /a\.root-servers\.net/;
+const bogusServer = "0.0.0.0";
+
+/**
+ * Performs DNS query and checks the result
+ * @param {object} monitorOpts the parameters for the monitor
+ * @returns {Promise} the heartbeat produced by the check
+ */
+async function testDns(monitorOpts) {
+ if (!monitorOpts.hostname) {
+ monitorOpts.hostname = queryName;
+ }
+ if (!monitorOpts.dnsResolveType) {
+ monitorOpts.dnsResolveType = rrtype;
+ }
+ if (!monitorOpts.conditions) {
+ monitorOpts.conditions = "[]";
+ }
+ const heartbeat = {
+ msg: "",
+ status: PENDING,
+ };
+ const dnsMonitor = new DnsMonitorType();
+
+ await dnsMonitor.check(monitorOpts, heartbeat, {});
+
+ return heartbeat;
+}
+
+describe("DNS monitor transport methods", {
+ concurrency: true
+}, () => {
+ test("DNS (UDP)", async () => {
+
+ const monitor = {
+ dnsResolveServer: "1.1.1.1",
+ port: 53,
+ dnsTransport: "UDP",
+ };
+
+ const heartbeat = await testDns(monitor);
+ assert.strictEqual(heartbeat.status, UP);
+ assert.match(heartbeat.msg, sampleRecordRegex);
+ });
+
+ test("DNS (UDP) timeout", async () => {
+
+ const monitor = {
+ dnsResolveServer: bogusServer,
+ port: 53,
+ dnsTransport: "UDP",
+ timeout: 10000,
+ };
+
+ await assert.rejects(testDns(monitor), {
+ message: /Query to .* timed out/
+ }, "Expected query timeout error");
+ });
+
+ test("DNS (TCP)", async () => {
+
+ const monitor = {
+ dnsResolveServer: "1.1.1.1",
+ port: 53,
+ dnsTransport: "TCP",
+ };
+
+ const heartbeat = await testDns(monitor);
+ assert.strictEqual(heartbeat.status, UP);
+ assert.match(heartbeat.msg, sampleRecordRegex);
+ });
+
+ test("DNS (TCP) timeout", async () => {
+
+ const monitor = {
+ dnsResolveServer: bogusServer,
+ port: 53,
+ dnsTransport: "TCP",
+ timeout: 10000,
+ };
+
+ await assert.rejects(testDns(monitor), {
+ message: /Connection to .* (timed out|refused)/
+ }, "Expected connection timeout error");
+ });
+
+ test("DNS over TLS", async () => {
+
+ const monitor = {
+ dnsResolveServer: "one.one.one.one",
+ port: 853,
+ dnsTransport: "DoT",
+ };
+
+ const heartbeat = await testDns(monitor);
+ assert.strictEqual(heartbeat.status, UP);
+ assert.match(heartbeat.msg, sampleRecordRegex);
+ });
+
+ test("DNS over TLS timeout", async () => {
+
+ const monitor = {
+ dnsResolveServer: bogusServer,
+ port: 853,
+ dnsTransport: "DoT",
+ timeout: 10000,
+ };
+
+ await assert.rejects(testDns(monitor), {
+ message: /Connection to .* (timed out|refused)/
+ }, "Expected connection timeout error");
+ });
+
+ test("DNS over HTTPS (GET)", async () => {
+
+ const monitor = {
+ dnsResolveServer: "cloudflare-dns.com",
+ port: 443,
+ dnsTransport: "DoH",
+ dohQueryPath: "dns-query",
+ method: "GET",
+ };
+
+ const heartbeat = await testDns(monitor);
+ assert.strictEqual(heartbeat.status, UP);
+ assert.match(heartbeat.msg, sampleRecordRegex);
+ });
+
+ test("DNS over HTTPS timeout", async () => {
+
+ const monitor = {
+ dnsResolveServer: bogusServer,
+ port: 443,
+ dnsTransport: "DoH",
+ timeout: 10000,
+ };
+
+ await assert.rejects(testDns(monitor), {
+ message: /Connection to .* (timed out|refused)/
+ }, "Expected connection timeout error");
+ });
+
+ test("DNS over HTTP/2 (POST)", async () => {
+
+ const monitor = {
+ dnsResolveServer: "cloudflare-dns.com",
+ port: 443,
+ dnsTransport: "DoH",
+ dohQueryPath: "dns-query",
+ method: "POST",
+ forceHttp2: true,
+ };
+
+ const heartbeat = await testDns(monitor);
+ assert.strictEqual(heartbeat.status, UP);
+ assert.match(heartbeat.msg, sampleRecordRegex);
+ });
+
+ test("DNS over HTTP/2 timeout", async () => {
+
+ const monitor = {
+ dnsResolveServer: bogusServer,
+ port: 443,
+ dnsTransport: "DoH",
+ timeout: 10000,
+ forceHttp2: true,
+ };
+
+ await assert.rejects(testDns(monitor), {
+ message: /Connection to .* (timed out|refused)/
+ }, "Expected connection timeout error");
+ });
+
+});
diff --git a/test/e2e/specs/monitor-form.spec.js b/test/e2e/specs/monitor-form.spec.js
index b41f6ceb9..4936dde37 100644
--- a/test/e2e/specs/monitor-form.spec.js
+++ b/test/e2e/specs/monitor-form.spec.js
@@ -53,7 +53,7 @@ test.describe("Monitor Form", () => {
const friendlyName = "Example DNS NS";
await page.getByTestId("friendly-name-input").fill(friendlyName);
- await page.getByTestId("hostname-input").fill("example.com");
+ await page.getByTestId("hostname-input").fill(".");
const resolveTypeSelect = page.getByTestId("resolve-type-select");
await resolveTypeSelect.click();
@@ -65,9 +65,9 @@ test.describe("Monitor Form", () => {
await page.getByTestId("add-condition-button").click();
expect(await page.getByTestId("condition").count()).toEqual(2); // 2 explicitly added
- await page.getByTestId("condition-value").nth(0).fill("a.iana-servers.net");
+ await page.getByTestId("condition-value").nth(0).fill("a.root-servers.net");
await page.getByTestId("condition-and-or").nth(0).selectOption("or");
- await page.getByTestId("condition-value").nth(1).fill("b.iana-servers.net");
+ await page.getByTestId("condition-value").nth(1).fill("b.root-servers.net");
await screenshot(testInfo, page);
await page.getByTestId("save-button").click();
@@ -86,7 +86,7 @@ test.describe("Monitor Form", () => {
const friendlyName = "Example DNS NS";
await page.getByTestId("friendly-name-input").fill(friendlyName);
- await page.getByTestId("hostname-input").fill("example.com");
+ await page.getByTestId("hostname-input").fill(".");
const resolveTypeSelect = page.getByTestId("resolve-type-select");
await resolveTypeSelect.click();
@@ -105,4 +105,38 @@ test.describe("Monitor Form", () => {
await screenshot(testInfo, page);
});
+
+ test("dns transport", async ({ page }, testInfo) => {
+ await page.goto("./add");
+ await login(page);
+ await screenshot(testInfo, page);
+ await selectMonitorType(page);
+
+ const friendlyName = "Cloudflare";
+ await page.getByTestId("friendly-name-input").fill(friendlyName);
+ await page.getByTestId("hostname-input").fill("one.one.one.one");
+ await page.getByTestId("resolve-server-input").fill("cloudflare-dns.com");
+ await page.getByTestId("port-input").fill("443");
+
+ const resolveTypeSelect = page.getByTestId("resolve-type-select");
+ await resolveTypeSelect.click();
+ await resolveTypeSelect.getByRole("option", { name: "SOA" }).click();
+
+ const transportMethodSelect = page.getByTestId("transport-method-select");
+ await transportMethodSelect.click();
+ await transportMethodSelect.getByRole("option", { name: "DoH" }).click();
+
+ const httpMethodSelect = page.getByTestId("method-select");
+ await httpMethodSelect.selectOption("POST");
+
+ await page.getByTestId("http2-check").check();
+
+ await screenshot(testInfo, page);
+ await page.getByTestId("save-button").click();
+ await page.waitForURL("/dashboard/*");
+
+ expect(page.getByTestId("monitor-status")).toHaveText("up", { ignoreCase: true });
+
+ await screenshot(testInfo, page);
+ });
});