From 8af17ca30d5c63a6f0ed33b278705a92109ba14a Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Tue, 22 Nov 2022 14:56:59 -0500 Subject: [PATCH] check if print configs are allowed --- handlers/print-get/screen.js | 5 +++++ handlers/print-get/screen.ts | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/handlers/print-get/screen.js b/handlers/print-get/screen.js index 0250afa7..b93a3390 100644 --- a/handlers/print-get/screen.js +++ b/handlers/print-get/screen.js @@ -2,6 +2,11 @@ import * as configFunctions from "../../helpers/functions.config.js"; import { getReportData, getScreenPrintConfig } from "../../helpers/functions.print.js"; export const handler = (request, response) => { const printName = request.params.printName; + if (!configFunctions.getProperty("settings.lotOccupancy.prints").includes(printName) && + !configFunctions.getProperty("settings.workOrders.prints").includes(printName)) { + return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") + + "/dashboard/?error=printConfigNotAllowed"); + } const printConfig = getScreenPrintConfig(printName); if (!printConfig) { return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") + diff --git a/handlers/print-get/screen.ts b/handlers/print-get/screen.ts index a2e2bf21..a1f5c1bb 100644 --- a/handlers/print-get/screen.ts +++ b/handlers/print-get/screen.ts @@ -6,6 +6,16 @@ import { getReportData, getScreenPrintConfig } from "../../helpers/functions.pri export const handler: RequestHandler = (request, response) => { const printName = request.params.printName; + if ( + !configFunctions.getProperty("settings.lotOccupancy.prints").includes(printName) && + !configFunctions.getProperty("settings.workOrders.prints").includes(printName) + ) { + return response.redirect( + configFunctions.getProperty("reverseProxy.urlPrefix") + + "/dashboard/?error=printConfigNotAllowed" + ); + } + const printConfig = getScreenPrintConfig(printName); if (!printConfig) {