Addresses review feedback on #3848. Timeout: the probe now dials a user-defined port, so it can reach a service that accepts the connection but never completes the TLS handshake, hanging the request indefinitely. ssl-checker already wires a "timeout" listener that rejects with "Timed Out", but its defaults set no timeout, so it never fired. Passing one activates it. The bundled type declaration is a hand-maintained subset of https.RequestOptions and omitted "timeout"; it is added there so the call typechecks against an option the library already supports. Client gating: "http" is a single monitor type covering both schemes, so an http:// monitor passed the existing type check and requested a certificate anyway. With the server now rejecting those, the details page would surface a 400 on every visit. The scheme is gated client side to match, and the stat box falls back to "N/A" as before. Test comment removed as requested; the timeout is covered by a new assertion in the same file.
102 lines
3.5 KiB
TypeScript
102 lines
3.5 KiB
TypeScript
import { describe, expect, it } from "@jest/globals";
|
|
import { fetchMonitorCertificate } from "../../../src/api/controllers/controllerUtils.ts";
|
|
import type { Monitor } from "../../../src/domain/monitors/monitor.type.ts";
|
|
import type { SSLDetails, SSLOptions } from "ssl-checker";
|
|
|
|
const VALID_CERT: SSLDetails = {
|
|
daysRemaining: 30,
|
|
valid: true,
|
|
validFrom: "2026-01-01T00:00:00.000Z",
|
|
validTo: "2026-12-31T00:00:00.000Z",
|
|
validFor: ["example.com"],
|
|
};
|
|
|
|
/** Records the arguments the checker was called with. */
|
|
const spyChecker = (cert: SSLDetails = VALID_CERT) => {
|
|
const calls: Array<{ hostname: string; options?: SSLOptions }> = [];
|
|
const checker = (async (hostname: string, options?: SSLOptions) => {
|
|
calls.push({ hostname, options });
|
|
return cert;
|
|
}) as unknown as typeof import("ssl-checker").default;
|
|
return { checker, calls };
|
|
};
|
|
|
|
const monitorWithUrl = (url: string) => ({ url }) as Monitor;
|
|
|
|
describe("fetchMonitorCertificate", () => {
|
|
it("probes the port named in the monitor URL", async () => {
|
|
const { checker, calls } = spyChecker();
|
|
|
|
await fetchMonitorCertificate(checker, monitorWithUrl("https://example.com:54321"));
|
|
|
|
expect(calls).toHaveLength(1);
|
|
expect(calls[0].hostname).toBe("example.com");
|
|
expect(calls[0].options?.port).toBe(54321);
|
|
});
|
|
|
|
it("falls back to 443 when the URL names no port", async () => {
|
|
const { checker, calls } = spyChecker();
|
|
|
|
await fetchMonitorCertificate(checker, monitorWithUrl("https://example.com"));
|
|
|
|
expect(calls[0].options?.port).toBe(443);
|
|
});
|
|
|
|
it("passes an explicit 443 through unchanged", async () => {
|
|
const { checker, calls } = spyChecker();
|
|
|
|
await fetchMonitorCertificate(checker, monitorWithUrl("https://example.com:443"));
|
|
|
|
expect(calls[0].options?.port).toBe(443);
|
|
});
|
|
|
|
it("bounds the probe with a timeout so a user-defined port cannot hang it", async () => {
|
|
const { checker, calls } = spyChecker();
|
|
|
|
await fetchMonitorCertificate(checker, monitorWithUrl("https://example.com:54321"));
|
|
|
|
expect(calls[0].options?.timeout).toBe(10_000);
|
|
});
|
|
|
|
it("never passes NaN as the port", async () => {
|
|
const { checker, calls } = spyChecker();
|
|
|
|
await fetchMonitorCertificate(checker, monitorWithUrl("https://example.com"));
|
|
|
|
expect(Number.isNaN(calls[0].options?.port)).toBe(false);
|
|
});
|
|
|
|
it("rejects a plain-HTTP monitor without opening a TLS connection", async () => {
|
|
const { checker, calls } = spyChecker();
|
|
|
|
// Probing a non-TLS port would surface a raw OpenSSL handshake error.
|
|
await expect(fetchMonitorCertificate(checker, monitorWithUrl("http://example.com:8080"))).rejects.toThrow(
|
|
"Certificate is only available for HTTPS monitors"
|
|
);
|
|
expect(calls).toHaveLength(0);
|
|
});
|
|
|
|
it("rejects a plain-HTTP monitor on the default port", async () => {
|
|
const { checker, calls } = spyChecker();
|
|
|
|
await expect(fetchMonitorCertificate(checker, monitorWithUrl("http://example.com"))).rejects.toThrow(
|
|
"Certificate is only available for HTTPS monitors"
|
|
);
|
|
expect(calls).toHaveLength(0);
|
|
});
|
|
|
|
it("returns the certificate details it received", async () => {
|
|
const { checker } = spyChecker();
|
|
|
|
const cert = await fetchMonitorCertificate(checker, monitorWithUrl("https://example.com:8443"));
|
|
|
|
expect(cert.validTo).toBe(VALID_CERT.validTo);
|
|
});
|
|
|
|
it("throws when the certificate has no expiry", async () => {
|
|
const { checker } = spyChecker({ ...VALID_CERT, validTo: undefined as unknown as string });
|
|
|
|
await expect(fetchMonitorCertificate(checker, monitorWithUrl("https://example.com:8443"))).rejects.toThrow("Certificate not found");
|
|
});
|
|
});
|