From a6c3c56d0bca064eab89255ce28bbf19428fed0c Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 3 Sep 2024 15:00:30 -0700 Subject: [PATCH 1/3] add getMonitorStatsByIdValidation --- Server/validation/joi.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Server/validation/joi.js b/Server/validation/joi.js index ccc8da9f6..7e16fa21f 100644 --- a/Server/validation/joi.js +++ b/Server/validation/joi.js @@ -1,4 +1,5 @@ const joi = require("joi"); +const { normalize } = require("path"); //**************************************** // Custom Validators @@ -177,6 +178,18 @@ const getMonitorsByTeamIdQueryValidation = joi.object({ ), }); +getMonitorStatsByIdParamValidation = joi.object({ + monitorId: joi.string().required(), +}); +getMonitorStatsByIdQueryValidation = joi.object({ + status: joi.string(), + limit: joi.number(), + sortOrder: joi.string().valid("asc", "desc"), + dateRange: joi.string().valid("day", "week", "month"), + numToDisplay: joi.number(), + normalize: joi.boolean(), +}); + const createMonitorBodyValidation = joi.object({ _id: joi.string(), userId: joi.string().required(), From cece932e451cc199e1a117bf3ecc4390afd04451 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 3 Sep 2024 15:07:11 -0700 Subject: [PATCH 2/3] Implement validation --- Server/controllers/monitorController.js | 4 ++++ Server/validation/joi.js | 2 ++ 2 files changed, 6 insertions(+) diff --git a/Server/controllers/monitorController.js b/Server/controllers/monitorController.js index f33ddcf10..c0243adac 100644 --- a/Server/controllers/monitorController.js +++ b/Server/controllers/monitorController.js @@ -6,6 +6,8 @@ const { editMonitorBodyValidation, getMonitorsByTeamIdQueryValidation, pauseMonitorParamValidation, + getMonitorStatsByIdParamValidation, + getMonitorStatsByIdQueryValidation, } = require("../validation/joi"); const sslChecker = require("ssl-checker"); @@ -46,6 +48,8 @@ const getAllMonitors = async (req, res, next) => { const getMonitorStatsById = async (req, res, next) => { try { //Validation + await getMonitorStatsByIdParamValidation.validateAsync(req.params); + await getMonitorStatsByIdQueryValidation.validateAsync(req.query); } catch (error) { error.status = 422; error.message = diff --git a/Server/validation/joi.js b/Server/validation/joi.js index 7e16fa21f..921831b5e 100644 --- a/Server/validation/joi.js +++ b/Server/validation/joi.js @@ -370,6 +370,8 @@ module.exports = { getMonitorByIdQueryValidation, getMonitorsByTeamIdValidation, getMonitorsByTeamIdQueryValidation, + getMonitorStatsByIdParamValidation, + getMonitorStatsByIdQueryValidation, editMonitorBodyValidation, pauseMonitorParamValidation, editUserParamValidation, From 8bac81fb09397f0f77f8b73203cb293b17ad3aaf Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 3 Sep 2024 15:11:17 -0700 Subject: [PATCH 3/3] Add validation for certificate request --- Server/controllers/monitorController.js | 5 ++--- Server/validation/joi.js | 9 +++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Server/controllers/monitorController.js b/Server/controllers/monitorController.js index c0243adac..9576f3064 100644 --- a/Server/controllers/monitorController.js +++ b/Server/controllers/monitorController.js @@ -8,12 +8,12 @@ const { pauseMonitorParamValidation, getMonitorStatsByIdParamValidation, getMonitorStatsByIdQueryValidation, + getCertificateParamValidation, } = require("../validation/joi"); const sslChecker = require("ssl-checker"); const SERVICE_NAME = "monitorController"; const { errorMessages, successMessages } = require("../utils/messages"); -const { runInNewContext } = require("vm"); /** * Returns all monitors @@ -47,7 +47,6 @@ const getAllMonitors = async (req, res, next) => { */ const getMonitorStatsById = async (req, res, next) => { try { - //Validation await getMonitorStatsByIdParamValidation.validateAsync(req.params); await getMonitorStatsByIdQueryValidation.validateAsync(req.query); } catch (error) { @@ -73,7 +72,7 @@ const getMonitorStatsById = async (req, res, next) => { const getMonitorCertificate = async (req, res, next) => { try { - //validation + await getCertificateParamValidation.validateAsync(req.params); } catch (error) { error.status = 422; error.message = diff --git a/Server/validation/joi.js b/Server/validation/joi.js index 921831b5e..f6a3aba68 100644 --- a/Server/validation/joi.js +++ b/Server/validation/joi.js @@ -178,10 +178,10 @@ const getMonitorsByTeamIdQueryValidation = joi.object({ ), }); -getMonitorStatsByIdParamValidation = joi.object({ +const getMonitorStatsByIdParamValidation = joi.object({ monitorId: joi.string().required(), }); -getMonitorStatsByIdQueryValidation = joi.object({ +const getMonitorStatsByIdQueryValidation = joi.object({ status: joi.string(), limit: joi.number(), sortOrder: joi.string().valid("asc", "desc"), @@ -190,6 +190,10 @@ getMonitorStatsByIdQueryValidation = joi.object({ normalize: joi.boolean(), }); +const getCertificateParamValidation = joi.object({ + monitorId: joi.string().required(), +}); + const createMonitorBodyValidation = joi.object({ _id: joi.string(), userId: joi.string().required(), @@ -372,6 +376,7 @@ module.exports = { getMonitorsByTeamIdQueryValidation, getMonitorStatsByIdParamValidation, getMonitorStatsByIdQueryValidation, + getCertificateParamValidation, editMonitorBodyValidation, pauseMonitorParamValidation, editUserParamValidation,