diff --git a/client/src/Utils/statusCode.ts b/client/src/Utils/statusCode.ts index 73ee2a892..7b5448d2e 100644 --- a/client/src/Utils/statusCode.ts +++ b/client/src/Utils/statusCode.ts @@ -123,6 +123,7 @@ export const ALL_HTTP_STATUS_CODES: HttpStatusCodeOption[] = [ { id: 417, name: "417 - Expectation Failed" }, { id: 418, name: "418 - I'm a Teapot" }, { id: 419, name: "419 - Page Expired (Laravel)" }, + { id: 420, name: "420 - Enhance Your Calm (Twitter)" }, { id: 421, name: "421 - Misdirected Request" }, { id: 422, name: "422 - Unprocessable Entity" }, { id: 423, name: "423 - Locked" }, @@ -132,7 +133,12 @@ export const ALL_HTTP_STATUS_CODES: HttpStatusCodeOption[] = [ { id: 428, name: "428 - Precondition Required" }, { id: 429, name: "429 - Too Many Requests" }, { id: 431, name: "431 - Request Header Fields Too Large" }, + { id: 440, name: "440 - Login Time-out (IIS)" }, + { id: 449, name: "449 - Retry With (IIS)" }, { id: 451, name: "451 - Unavailable For Legal Reasons" }, + { id: 460, name: "460 - Client Closed Connection (AWS ELB)" }, + { id: 463, name: "463 - X-Forwarded-For Too Large (AWS ELB)" }, + { id: 497, name: "497 - HTTP Request Sent to HTTPS Port (NGINX)" }, { id: 499, name: "499 - Client Closed Request (NGINX)" }, { id: 500, name: "500 - Internal Server Error" }, { id: 501, name: "501 - Not Implemented" }, @@ -143,6 +149,7 @@ export const ALL_HTTP_STATUS_CODES: HttpStatusCodeOption[] = [ { id: 506, name: "506 - Variant Also Negotiates" }, { id: 507, name: "507 - Insufficient Storage" }, { id: 508, name: "508 - Loop Detected" }, + { id: 509, name: "509 - Bandwidth Limit Exceeded (Apache)" }, { id: 510, name: "510 - Not Extended" }, { id: 511, name: "511 - Network Authentication Required" }, { id: 520, name: "520 - Web Server Returned an Unknown Error (Cloudflare)" }, @@ -153,4 +160,7 @@ export const ALL_HTTP_STATUS_CODES: HttpStatusCodeOption[] = [ { id: 525, name: "525 - SSL Handshake Failed (Cloudflare)" }, { id: 526, name: "526 - Invalid SSL Certificate (Cloudflare)" }, { id: 527, name: "527 - Railgun Error (Cloudflare)" }, + { id: 529, name: "529 - Site is overloaded" }, + { id: 530, name: "530 - Site is frozen (Cloudflare)" }, + { id: 561, name: "561 - Unauthorized (AWS ELB)" }, ]; diff --git a/client/src/Validation/monitor.ts b/client/src/Validation/monitor.ts index a6006d543..e0c4eae07 100644 --- a/client/src/Validation/monitor.ts +++ b/client/src/Validation/monitor.ts @@ -2,6 +2,7 @@ import { z } from "zod"; import type { FieldPath } from "react-hook-form"; import { GeoContinents } from "@/Types/GeoCheck"; import { DnsRecordTypes, PageSpeedStrategies, type MonitorType } from "@/Types/Monitor"; +import { ALL_HTTP_STATUS_CODES } from "@/Utils/statusCode"; // Wizard step a field is validated on. Attached inline to each field below so // the grouping lives next to the field definition; unannotated fields default @@ -53,6 +54,11 @@ const geoCheckFields = { }; // HTTP monitor schema +const httpStatusCodeSet = new Set(ALL_HTTP_STATUS_CODES.map((c) => c.id)); +const httpStatusCode = z.number().refine((code) => httpStatusCodeSet.has(code), { + message: "Must be a valid HTTP status code", +}); + const httpSchema = baseSchema.extend({ type: z.literal("http"), url: urlSchema, @@ -65,7 +71,7 @@ const httpSchema = baseSchema.extend({ expectedValue: z.string().optional().register(monitorStepRegistry, { step: 2 }), jsonPath: z.string().optional().register(monitorStepRegistry, { step: 2 }), customUpCodes: z - .array(z.number().min(100).max(599)) + .array(httpStatusCode) .optional() .register(monitorStepRegistry, { step: 2 }), ...geoCheckFields, diff --git a/server/src/domain/monitors/monitor.types.ts b/server/src/domain/monitors/monitor.types.ts index 37d477704..b614d3191 100644 --- a/server/src/domain/monitors/monitor.types.ts +++ b/server/src/domain/monitors/monitor.types.ts @@ -4,7 +4,29 @@ import type { GeoContinent, GroupedGeoCheck } from "@/domain/geo-checks/geo-chec export type { GeoContinent } from "@/domain/geo-checks/geo-check.type.js"; import http from "node:http"; -export const HttpStatusCodes = Object.keys(http.STATUS_CODES).map(Number); +export const HttpStatusCodes = [ + ...Object.keys(http.STATUS_CODES).map(Number), + 419, // Page Expired (Laravel) + 420, // Enhance Your Calm (Twitter) + 440, // Login Time-out (IIS) + 449, // Retry With (IIS) + 460, // Client Closed Connection (AWS ELB) + 463, // X-Forwarded-For Too Large (AWS ELB) + 497, // HTTP Request Sent to HTTPS Port (NGINX) + 499, // Client Closed Request (NGINX) + 509, // Bandwidth Limit Exceeded (Apache) + 520, // Web Server Returned an Unknown Error (Cloudflare) + 521, // Web Server Is Down (Cloudflare) + 522, // Connection Timed Out (Cloudflare) + 523, // Origin Is Unreachable (Cloudflare) + 524, // A Timeout Occurred (Cloudflare) + 525, // SSL Handshake Failed (Cloudflare) + 526, // Invalid SSL Certificate (Cloudflare) + 527, // Railgun Error (Cloudflare) + 529, // Site is overloaded + 530, // Site is frozen (Cloudflare) + 561, // Unauthorized (AWS ELB) +]; export const HttpStatusCodeSet = new Set(HttpStatusCodes); export type HttpStatusCode = number;