tighten validation, add tests

server/test/unit/providers/network/dnsProvider.test.ts

@@ -187,6 +187,28 @@ describe("DNSProvider", () => {
 		await expect(provider.handle(makeMonitor())).rejects.toThrow("Error performing DNS check");
 	});
 
+	it("strips scheme from url before querying the resolver", async () => {
+		const provider = new DNSProvider(createResolver);
+		const result = await provider.handle(makeMonitor({ url: "https://www.google.ca" }));
+
+		expect(mockResolverInstance.resolve4).toHaveBeenCalledWith("www.google.ca");
+		expect(result.payload?.hostname).toBe("www.google.ca");
+	});
+
+	it("strips port and path from url before querying the resolver", async () => {
+		const provider = new DNSProvider(createResolver);
+		await provider.handle(makeMonitor({ url: "example.com:53/some/path" }));
+
+		expect(mockResolverInstance.resolve4).toHaveBeenCalledWith("example.com");
+	});
+
+	it("passes a bare hostname through unchanged", async () => {
+		const provider = new DNSProvider(createResolver);
+		await provider.handle(makeMonitor({ url: "example.com" }));
+
+		expect(mockResolverInstance.resolve4).toHaveBeenCalledWith("example.com");
+	});
+
 	it("stringifies non-Error throws from outside timeRequest", async () => {
 		mockResolverInstance.setServers.mockImplementationOnce(() => {
 			throw 42;

server/test/unit/validation/monitorValidation.test.ts

@@ -51,6 +51,39 @@ describe("monitorValidation — DNS fields", () => {
 			expect(parsed.dnsServer).toBeUndefined();
 			expect(parsed.dnsRecordType).toBeUndefined();
 		});
+
+		it("rejects a DNS monitor whose url has a scheme or path", () => {
+			for (const badUrl of ["https://example.com", "example.com/path", "example.com:53", " example.com"]) {
+				expect(() =>
+					createMonitorBodyValidation.parse({
+						...baseDnsBody,
+						url: badUrl,
+						dnsServer: "8.8.8.8",
+						dnsRecordType: "A",
+					})
+				).toThrow();
+			}
+		});
+
+		it("rejects a DNS monitor with an invalid dnsServer", () => {
+			expect(() =>
+				createMonitorBodyValidation.parse({
+					...baseDnsBody,
+					dnsServer: "not-an-ip",
+					dnsRecordType: "A",
+				})
+			).toThrow();
+		});
+
+		it("does not enforce the hostname rule for non-DNS monitors", () => {
+			const parsed = createMonitorBodyValidation.parse({
+				name: "HTTP check",
+				type: "http",
+				url: "https://example.com/some/path",
+			});
+
+			expect(parsed.url).toBe("https://example.com/some/path");
+		});
 	});
 
 	describe("editMonitorBodyValidation", () => {