From 015f4d39aaeb994efffbdb82e8588606b3813609 Mon Sep 17 00:00:00 2001 From: chris48s Date: Sun, 12 Jan 2025 14:59:50 +0000 Subject: [PATCH] use standard validators in server.js --- core/server/server.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/server/server.js b/core/server/server.js index e50ae7392b8d9..4ca5eb36b199d 100644 --- a/core/server/server.js +++ b/core/server/server.js @@ -16,7 +16,12 @@ import { makeSend } from '../base-service/legacy-result-sender.js' import { handleRequest } from '../base-service/legacy-request-handler.js' import { clearResourceCache } from '../base-service/resource-cache.js' import { rasterRedirectUrl } from '../badge-urls/make-badge-url.js' -import { fileSize, nonNegativeInteger } from '../../services/validators.js' +import { + fileSize, + nonNegativeInteger, + optionalUrl, + url as requiredUrl, +} from '../../services/validators.js' import log from './log.js' import PrometheusMetrics from './prometheus-metrics.js' import InfluxMetrics from './influx-metrics.js' @@ -54,8 +59,6 @@ const Joi = originalJoi }, })) -const optionalUrl = Joi.string().uri({ scheme: ['http', 'https'] }) -const requiredUrl = optionalUrl.required() const origins = Joi.arrayFromString().items(Joi.string().origin()) const defaultService = Joi.object({ authorizedOrigins: origins }).default({ authorizedOrigins: [],